From 4f3ab0cd5ec02720c413a17287b5cf2674951093 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 7 Jul 2010 21:21:47 +0000 Subject: [PATCH] old --- sys-libs/zlib/files/zlib-1.2.4-LDFLAGS.patch | 49 ---------------- sys-libs/zlib/files/zlib-1.2.4-build.patch | 34 ----------- .../files/zlib-1.2.4-configure-LANG.patch | 21 ------- .../files/zlib-1.2.4-visibility-support.patch | 45 -------------- sys-libs/zlib/zlib-1.2.4.ebuild | 58 ------------------- sys-libs/zlib/zlib-1.2.5.ebuild | 52 ----------------- 6 files changed, 259 deletions(-) delete mode 100644 sys-libs/zlib/files/zlib-1.2.4-LDFLAGS.patch delete mode 100644 sys-libs/zlib/files/zlib-1.2.4-build.patch delete mode 100644 sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch delete mode 100644 sys-libs/zlib/files/zlib-1.2.4-visibility-support.patch delete mode 100644 sys-libs/zlib/zlib-1.2.4.ebuild delete mode 100644 sys-libs/zlib/zlib-1.2.5.ebuild diff --git a/sys-libs/zlib/files/zlib-1.2.4-LDFLAGS.patch b/sys-libs/zlib/files/zlib-1.2.4-LDFLAGS.patch deleted file mode 100644 index 8b128bee1fed..000000000000 --- a/sys-libs/zlib/files/zlib-1.2.4-LDFLAGS.patch +++ /dev/null @@ -1,49 +0,0 @@ -respect LDFLAGS ! - ---- zlib-1.2.4/Makefile.in -+++ zlib-1.2.4/Makefile.in -@@ -26,7 +26,6 @@ - - SFLAGS=-O - --LDFLAGS=-L. libz.a - LDSHARED=$(CC) - CPP=$(CC) -E - -@@ -134,29 +133,29 @@ - -@mv objs/$*.o $@ - - $(SHAREDLIBV): $(PIC_OBJS) -- $(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) -lc -+ $(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) -lc $(LDFLAGS) - rm -f $(SHAREDLIB) $(SHAREDLIBM) - ln -s $@ $(SHAREDLIB) - ln -s $@ $(SHAREDLIBM) - -@rmdir objs - - example$(EXE): example.o $(STATICLIB) -- $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) -+ $(CC) $(CFLAGS) -o $@ -L. $^ $(LDFLAGS) - - minigzip$(EXE): minigzip.o $(STATICLIB) -- $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) -+ $(CC) $(CFLAGS) -o $@ -L. $^ $(LDFLAGS) - - examplesh$(EXE): example.o $(SHAREDLIBV) -- $(CC) $(CFLAGS) -o $@ example.o -L. $(SHAREDLIBV) -+ $(CC) $(CFLAGS) -o $@ -L. $^ $(LDFLAGS) - - minigzipsh$(EXE): minigzip.o $(SHAREDLIBV) -- $(CC) $(CFLAGS) -o $@ minigzip.o -L. $(SHAREDLIBV) -+ $(CC) $(CFLAGS) -o $@ -L. $^ $(LDFLAGS) - - example64$(EXE): example64.o $(STATICLIB) -- $(CC) $(CFLAGS) -o $@ example64.o $(LDFLAGS) -+ $(CC) $(CFLAGS) -o $@ -L. $^ $(LDFLAGS) - - minigzip64$(EXE): minigzip64.o $(STATICLIB) -- $(CC) $(CFLAGS) -o $@ minigzip64.o $(LDFLAGS) -+ $(CC) $(CFLAGS) -o $@ -L. $^ $(LDFLAGS) - - install-libs: $(LIBS) - -@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi diff --git a/sys-libs/zlib/files/zlib-1.2.4-build.patch b/sys-libs/zlib/files/zlib-1.2.4-build.patch deleted file mode 100644 index 52b398cef055..000000000000 --- a/sys-libs/zlib/files/zlib-1.2.4-build.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- zlib-1.2.4/win32/Makefile.gcc -+++ zlib-1.2.4/win32/Makefile.gcc -@@ -30,21 +30,23 @@ - #LOC = -DASMV - #LOC = -DDEBUG -g - --CC = gcc --CFLAGS = $(LOC) -O3 -Wall -+CC ?= gcc -+CFLAGS ?= $(LOC) -O3 -Wall - --AS = $(CC) --ASFLAGS = $(LOC) -Wall -+AS ?= $(CC) -+ASFLAGS ?= $(LOC) -Wall - - LD = $(CC) --LDFLAGS = $(LOC) -s -+LDFLAGS ?= $(LOC) - --AR = ar -+AR ?= ar - ARFLAGS = rcs - --RC = windres -+RC ?= windres - RCFLAGS = --define GCC_WINDRES - -+DLLWRAP ?= dllwrap -+ --STRIP = strip -+STRIP = # - - CP = cp -fp diff --git a/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch b/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch deleted file mode 100644 index 26a20da523bc..000000000000 --- a/sys-libs/zlib/files/zlib-1.2.4-configure-LANG.patch +++ /dev/null @@ -1,21 +0,0 @@ -http://bugs.gentoo.org/310225 - ---- configure -+++ configure -@@ -43,11 +43,11 @@ - echo ' configure [--zprefix] [--prefix=PREFIX] [--eprefix=EXPREFIX]' - echo ' [--static] [--64] [--libdir=LIBDIR] [--includedir=INCLUDEDIR]' - exit 0 ;; -- -p*=* | --prefix=*) prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift ;; -- -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/[-a-z_]*=//'`; shift ;; -- -l*=* | --libdir=*) libdir=`echo $1 | sed 's/[-a-z_]*=//'`; shift ;; -- -i*=* | --includedir=*) includedir=`echo $1 | sed 's/[-a-z_]*=//'`;shift ;; -- -u*=* | --uname=*) uname=`echo $1 | sed 's/[-a-z_]*=//'`;shift ;; -+ -p*=* | --prefix=*) prefix=`echo $1 | sed 's/.*=//'`; shift ;; -+ -e*=* | --eprefix=*) exec_prefix=`echo $1 | sed 's/.*=//'`; shift ;; -+ -l*=* | --libdir=*) libdir=`echo $1 | sed 's/.*=//'`; shift ;; -+ -i*=* | --includedir=*) includedir=`echo $1 | sed 's/.*=//'`;shift ;; -+ -u*=* | --uname=*) uname=`echo $1 | sed 's/.*=//'`;shift ;; - -p* | --prefix) prefix="$2"; shift; shift ;; - -e* | --eprefix) exec_prefix="$2"; shift; shift ;; - -l* | --libdir) libdir="$2"; shift; shift ;; diff --git a/sys-libs/zlib/files/zlib-1.2.4-visibility-support.patch b/sys-libs/zlib/files/zlib-1.2.4-visibility-support.patch deleted file mode 100644 index 78c902abde6d..000000000000 --- a/sys-libs/zlib/files/zlib-1.2.4-visibility-support.patch +++ /dev/null @@ -1,45 +0,0 @@ -Only export symbols that should be exported. - -Patch by Mike Frysinger - -http://bugs.gentoo.org/32764 -http://bugs.gentoo.org/149929 - ---- zlib-1.2.4/configure -+++ zlib-1.2.4/configure -@@ -209,6 +209,20 @@ - fi - - cat > $test.c </dev/null; then -+ CFLAGS="$CFLAGS -DHAS_attribute_visibility -fvisibility=hidden" -+ echo "Checking for attribute(visibility) support... Yes." -+else -+ echo "Checking for attribute(visibility) support... No." -+fi -+ -+cat > $test.c < - #include - #include "zconf.h" ---- zlib-1.2.4/zconf.h.in -+++ zlib-1.2.4/zconf.h.in -@@ -244,7 +244,11 @@ - #endif - - #ifndef ZEXTERN --# define ZEXTERN extern -+# if defined(ZLIB_INTERNAL) && defined(HAS_attribute_visibility) -+# define ZEXTERN extern __attribute__ ((visibility("default"))) -+# else -+# define ZEXTERN extern -+# endif - #endif - #ifndef ZEXPORT - # define ZEXPORT diff --git a/sys-libs/zlib/zlib-1.2.4.ebuild b/sys-libs/zlib/zlib-1.2.4.ebuild deleted file mode 100644 index 5bb9ea1f7beb..000000000000 --- a/sys-libs/zlib/zlib-1.2.4.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.4.ebuild,v 1.4 2010/04/14 02:23:25 vapier Exp $ - -inherit eutils toolchain-funcs - -DESCRIPTION="Standard (de)compression library" -HOMEPAGE="http://www.zlib.net/" -SRC_URI="http://www.gzip.org/zlib/${P}.tar.bz2 - http://www.zlib.net/${P}.tar.bz2" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -IUSE="" - -RDEPEND="!&1`" = ""; then - # +if (...) 2>/dev/null; then - sed -i 's|\&1`" = ""|\1 2>/dev/null|' configure || die - sed -i -e '/ldconfig/d' Makefile* || die -} - -src_compile() { - tc-export AR CC RANLIB RC DLLWRAP - case ${CHOST} in - *-mingw*|mingw*) - emake -f win32/Makefile.gcc prefix=/usr || die - ;; - *) # not an autoconf script, so cant use econf - ./configure --shared --prefix=/usr --libdir=/usr/$(get_libdir) || die - emake || die - ;; - esac -} - -src_install() { - emake install DESTDIR="${D}" || die - dodoc FAQ README ChangeLog doc/*.txt - - case ${CHOST} in - *-mingw*|mingw*) - dobin zlib1.dll || die - dolib libz.dll.a || die - ;; - *) gen_usr_ldscript -a z ;; - esac -} diff --git a/sys-libs/zlib/zlib-1.2.5.ebuild b/sys-libs/zlib/zlib-1.2.5.ebuild deleted file mode 100644 index e2e5f286f456..000000000000 --- a/sys-libs/zlib/zlib-1.2.5.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/zlib/zlib-1.2.5.ebuild,v 1.2 2010/04/20 20:34:54 vapier Exp $ - -inherit eutils toolchain-funcs - -DESCRIPTION="Standard (de)compression library" -HOMEPAGE="http://www.zlib.net/" -SRC_URI="http://www.gzip.org/zlib/${P}.tar.bz2 - http://www.zlib.net/${P}.tar.bz2" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" -IUSE="" - -RDEPEND="!&1`" = ""; then - # +if (...) 2>/dev/null; then - sed -i 's|\&1`" = ""|\1 2>/dev/null|' configure || die -} - -src_compile() { - case ${CHOST} in - *-mingw*|mingw*) - emake -f win32/Makefile.gcc prefix=/usr STRIP= PREFIX=${CHOST}- || die - ;; - *) # not an autoconf script, so cant use econf - ./configure --shared --prefix=/usr --libdir=/usr/$(get_libdir) || die - emake || die - ;; - esac -} - -src_install() { - emake install DESTDIR="${D}" LDCONFIG=: || die - dodoc FAQ README ChangeLog doc/*.txt - - case ${CHOST} in - *-mingw*|mingw*) - dobin zlib1.dll || die - dolib libz.dll.a || die - ;; - *) gen_usr_ldscript -a z ;; - esac -} -- 2.26.2