diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
| commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
| tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-libs/shhopt/files | |
| parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) | |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/shhopt/files')
| -rw-r--r-- | dev-libs/shhopt/files/shhopt-1.1.7-build.patch | 83 |
1 files changed, 0 insertions, 83 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 deleted file mode 100644 index d1d5606faab6..000000000000 --- a/dev-libs/shhopt/files/shhopt-1.1.7-build.patch +++ /dev/null @@ -1,83 +0,0 @@ ---- 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 * |