summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-libs/shhopt/files/shhopt-1.1.7-build.patch
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-libs/shhopt/files/shhopt-1.1.7-build.patch')
-rw-r--r--dev-libs/shhopt/files/shhopt-1.1.7-build.patch83
1 files changed, 83 insertions, 0 deletions
diff --git a/dev-libs/shhopt/files/shhopt-1.1.7-build.patch b/dev-libs/shhopt/files/shhopt-1.1.7-build.patch
new file mode 100644
index 000000000000..d1d5606faab6
--- /dev/null
+++ b/dev-libs/shhopt/files/shhopt-1.1.7-build.patch
@@ -0,0 +1,83 @@
+--- Makefile
++++ Makefile
+@@ -5,20 +5,15 @@
+ VERPAT = 7
+ VERSION = $(VERMAJ).$(VERMIN).$(VERPAT)
+
+-# Define SHARED as 1 for Linux shared ELF library
+-#SHARED = 1
+-
+-ifeq ($(SHARED),1)
+ LIBTARGET = lib$(DIST).so.$(VERSION)
+ LIBTARGETSO = lib$(DIST).so
+ LIBTARGETSOMAJ = $(LIBTARGETSO).$(VERMAJ)
+ CCSHRD = -fPIC
+-else
+-LIBTARGET = lib$(DIST).a
+-endif
++
++LIBTARGETA = lib$(DIST).a
+
+ LIBHEAD = $(DIST).h
+-TARGETS = $(LIBTARGET)
++TARGETS = $(LIBTARGET) $(LIBTARGETA)
+
+ INSTBASEDIR = /usr/local
+ INSTLIBDIR = $(INSTBASEDIR)/lib
+@@ -27,12 +22,12 @@
+ INSTALLPROG = install -m 755
+ MKDIRP = install -d -m 755
+
+-CC = gcc
+-OPTIM = -O2
+-
+-INCDIR = -I.
+-
+-CCOPT = -s -Wall $(OPTIM) $(INCDIR)
++CC ?= gcc
++AR ?= ar
++ARFLAGS ?= rc
++RANLIB ?= ranlib
++CPPFLAGS += -I.
++CFLAGS += -Wall
+
+ # Object files to store in the library
+ LIBOBJS = shhopt.o
+@@ -43,21 +38,19 @@
+ # don't worry if you get ranlib not found errors. This probably means
+ # that your ar does an implicit ranlib and you do not need to run ranlib
+ # separately. This error is harmless.
+-$(LIBTARGET): $(LIBOBJS)
+-ifeq ($(SHARED),1)
+- $(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS)
+-else
+- ar rc $(LIBTARGET) $(LIBOBJS)
+- ranlib $(LIBTARGET) || true
+-endif
++$(LIBTARGET): $(LIBOBJS:.o=.lo)
++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $@ $^
++$(LIBTARGETA): $(LIBOBJS)
++ $(AR) $(ARFLAGS) $@ $^
++ $(RANLIB) $@
+
+ # Note that you may need GNU's -liberty if your libc lacks strtoul
+ example: $(LIBTARGET) example.o
+ $(CC) -o example example.c \
+ -L. -I. -L$(INSTLIBDIR) -I$(INSTINCDIR) -lshhopt
+
+-.c.o:
+- $(CC) $(CCSHRD) -o $@ -c $(CCOPT) $<
++%.lo: %.c
++ $(COMPILE.c) $(CCSHRD) $^ -o $@
+
+ depend dep:
+ $(CC) $(INCDIR) -MM *.c >depend
+@@ -73,7 +66,7 @@
+ endif
+
+ clean:
+- rm -f *.o core *~ depend
++ rm -f *.o *.lo *.so* *.a core *~ depend
+
+ chmod:
+ chmod a+r *