diff options
author | Mike Frysinger <vapier@gentoo.org> | 2008-01-27 10:48:03 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2008-01-27 10:48:03 +0000 |
commit | 04e4f7f11c133131de162d62c364fc0899a2c10a (patch) | |
tree | ba96b0321904c74d139ed80940c768345154e733 /media-libs/svgalib/files | |
parent | Stable on ppc; bug #207640 (diff) | |
download | historical-04e4f7f11c133131de162d62c364fc0899a2c10a.tar.gz historical-04e4f7f11c133131de162d62c364fc0899a2c10a.tar.bz2 historical-04e4f7f11c133131de162d62c364fc0899a2c10a.zip |
patch cleanup
Package-Manager: portage-2.1.4
Diffstat (limited to 'media-libs/svgalib/files')
-rw-r--r-- | media-libs/svgalib/files/svgalib-1.9.19-pic.patch | 4 | ||||
-rw-r--r-- | media-libs/svgalib/files/svgalib-1.9.25-build.patch | 46 | ||||
-rw-r--r-- | media-libs/svgalib/files/svgalib-1.9.25-gentoo.patch | 42 |
3 files changed, 50 insertions, 42 deletions
diff --git a/media-libs/svgalib/files/svgalib-1.9.19-pic.patch b/media-libs/svgalib/files/svgalib-1.9.19-pic.patch index cc53366498c4..b068886cc1d1 100644 --- a/media-libs/svgalib/files/svgalib-1.9.19-pic.patch +++ b/media-libs/svgalib/files/svgalib-1.9.19-pic.patch @@ -1,3 +1,7 @@ +the -fPIC flag does work for lrmi + +http://bugs.gentoo.org/51698 + --- svgalib-1.9.19/src/Makefile.jj 2004-09-09 09:08:24.369399280 -0700 +++ svgalib-1.9.19/src/Makefile 2004-09-09 09:08:32.340187536 -0700 @@ -462,8 +462,8 @@ diff --git a/media-libs/svgalib/files/svgalib-1.9.25-build.patch b/media-libs/svgalib/files/svgalib-1.9.25-build.patch index 2e3325a29ba2..32f69d78fc15 100644 --- a/media-libs/svgalib/files/svgalib-1.9.25-build.patch +++ b/media-libs/svgalib/files/svgalib-1.9.25-build.patch @@ -1,5 +1,20 @@ +fix up build + +dont strip the binary as portage will take care of it + --- Makefile.cfg +++ Makefile.cfg +--- svgalib-1.9.25/Makefile.cfg ++++ svgalib-1.9.25/Makefile.cfg +@@ -44,7 +44,7 @@ CONFDIR = $(SRCDIR)/src/config + # Common prefix for installation directories. + # NOTE: This directory must exist when you start the install. + TOPDIR= +-prefix = $(TOPDIR)/usr/local ++prefix = $(TOPDIR)/usr + exec_prefix = $(prefix) + + # Directory where the shared stubs and static library will be installed. @@ -313,14 +313,13 @@ WARN = -Wall -Wstrict-prototypes INCLUDES = -I$(srcdir)/include -I. @@ -16,3 +31,34 @@ INSTALL_SCRIPT = install -m755 INSTALL_SHLIB = install -m755 INSTALL_DATA = install -m644 +--- svgalib-1.9.25/Makefile ++++ svgalib-1.9.25/Makefile +@@ -99,8 +99,6 @@ + (cd $(sharedlibdir); \ + ln -sf $$foo `echo $$foo | sed 's/\.so\..*/.so/'` ); \ + done +- @./fixldsoconf +- -ldconfig + + installstaticlib: static + @echo Installing static libraries in $(libdir). +--- svgalib-1.9.25/threeDKit/Makefile ++++ svgalib-1.9.25/threeDKit/Makefile +@@ -58,7 +58,6 @@ + $(sharedlibdir)/lib3dkit.so.$(VERSION): lib3dkit.so.$(VERSION) + $(INSTALL_SHLIB) $< $(sharedlibdir)/$< + (cd $(sharedlibdir); ln -sf lib3dkit.so.$(VERSION) `echo lib3dkit.so.$(VERSION) | sed 's/\.so\..*/.so/'` ) +- -ldconfig + + install: $(sharedlibdir)/lib3dkit.so.$(VERSION) installheaders + +--- svgalib-1.9.25/src/Makefile ++++ svgalib-1.9.25/src/Makefile +@@ -453,7 +453,6 @@ + + $(sharedlibdir)/libvga.so.$(VERSION): libvga.so.$(VERSION) + $(INSTALL_SHLIB) $< $(sharedlibdir)/$< +- -ldconfig + + install: $(sharedlibdir)/libvga.so.$(VERSION) + diff --git a/media-libs/svgalib/files/svgalib-1.9.25-gentoo.patch b/media-libs/svgalib/files/svgalib-1.9.25-gentoo.patch deleted file mode 100644 index 5ee2a985b17b..000000000000 --- a/media-libs/svgalib/files/svgalib-1.9.25-gentoo.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- svgalib-1.9.25/Makefile.cfg -+++ svgalib-1.9.25/Makefile.cfg -@@ -44,7 +44,7 @@ CONFDIR = $(SRCDIR)/src/config - # Common prefix for installation directories. - # NOTE: This directory must exist when you start the install. - TOPDIR= --prefix = $(TOPDIR)/usr/local -+prefix = $(TOPDIR)/usr - exec_prefix = $(prefix) - - # Directory where the shared stubs and static library will be installed. ---- svgalib-1.9.25/Makefile -+++ svgalib-1.9.25/Makefile -@@ -99,8 +99,6 @@ - (cd $(sharedlibdir); \ - ln -sf $$foo `echo $$foo | sed 's/\.so\..*/.so/'` ); \ - done -- @./fixldsoconf -- -ldconfig - - installstaticlib: static - @echo Installing static libraries in $(libdir). ---- svgalib-1.9.25/threeDKit/Makefile -+++ svgalib-1.9.25/threeDKit/Makefile -@@ -58,7 +58,6 @@ - $(sharedlibdir)/lib3dkit.so.$(VERSION): lib3dkit.so.$(VERSION) - $(INSTALL_SHLIB) $< $(sharedlibdir)/$< - (cd $(sharedlibdir); ln -sf lib3dkit.so.$(VERSION) `echo lib3dkit.so.$(VERSION) | sed 's/\.so\..*/.so/'` ) -- -ldconfig - - install: $(sharedlibdir)/lib3dkit.so.$(VERSION) installheaders - ---- svgalib-1.9.25/src/Makefile -+++ svgalib-1.9.25/src/Makefile -@@ -453,7 +453,6 @@ - - $(sharedlibdir)/libvga.so.$(VERSION): libvga.so.$(VERSION) - $(INSTALL_SHLIB) $< $(sharedlibdir)/$< -- -ldconfig - - install: $(sharedlibdir)/libvga.so.$(VERSION) - |