diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-01-10 13:58:09 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-01-10 13:58:09 +0000 |
| commit | 93ff1c6723a74446586c85420b6e5dceabf8c62b (patch) | |
| tree | 508ff98bee59738b9471e16bc12e7d7c9881397c /dev-libs/shhopt/files | |
| parent | Masking net-www/bk_edit pending removal. (diff) | |
| download | gentoo-2-93ff1c6723a74446586c85420b6e5dceabf8c62b.tar.gz gentoo-2-93ff1c6723a74446586c85420b6e5dceabf8c62b.tar.bz2 gentoo-2-93ff1c6723a74446586c85420b6e5dceabf8c62b.zip | |
Cleanup build and add amd64 love.
(Portage version: 2.1.2_rc4-r7)
Diffstat (limited to 'dev-libs/shhopt/files')
| -rw-r--r-- | dev-libs/shhopt/files/digest-shhopt-1.1.7-r2 | 3 | ||||
| -rw-r--r-- | dev-libs/shhopt/files/shhopt-1.1.7-build.patch | 83 |
2 files changed, 86 insertions, 0 deletions
diff --git a/dev-libs/shhopt/files/digest-shhopt-1.1.7-r2 b/dev-libs/shhopt/files/digest-shhopt-1.1.7-r2 new file mode 100644 index 000000000000..4e14dfb2b384 --- /dev/null +++ b/dev-libs/shhopt/files/digest-shhopt-1.1.7-r2 @@ -0,0 +1,3 @@ +MD5 caf24206354296e8a48771aea1f47fbd shhopt-1.1.7.tar.gz 9923 +RMD160 f987c4682d5119f73bf4c67693d9a83a85397408 shhopt-1.1.7.tar.gz 9923 +SHA256 bae94335124efa6fcc2f0a55cabd68c9c90be935bcdb8054d7e5188e0d5da679 shhopt-1.1.7.tar.gz 9923 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 * |