+++ /dev/null
-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
+++ /dev/null
---- 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
+++ /dev/null
-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 ;;
+++ /dev/null
-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 <<EOF
-+int foo __attribute__ ((visibility ("hidden")));
-+int main()
-+{
-+ return 0;
-+}
-+EOF
-+if ($CC -c -fvisibility=hidden $CFLAGS $test.c) 2>/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 <<EOF
- #include <stdio.h>
- #include <stdarg.h>
- #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
+++ /dev/null
-# 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="!<dev-libs/libxml2-2.7.7" #309623
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-1.2.4-build.patch
- epatch "${FILESDIR}"/${PN}-1.2.4-visibility-support.patch #149929
- epatch "${FILESDIR}"/${PN}-1.2.4-LDFLAGS.patch #126718
- epatch "${FILESDIR}"/${PN}-1.2.3-mingw-implib.patch #288212
- epatch "${FILESDIR}"/${PN}-1.2.4-configure-LANG.patch
- # trust exit status of the compiler rather than stderr #55434
- # -if test "`(...) 2>&1`" = ""; then
- # +if (...) 2>/dev/null; then
- sed -i 's|\<test "`\([^"]*\) 2>&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
-}
+++ /dev/null
-# 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="!<dev-libs/libxml2-2.7.7" #309623
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-1.2.3-mingw-implib.patch #288212
- # trust exit status of the compiler rather than stderr #55434
- # -if test "`(...) 2>&1`" = ""; then
- # +if (...) 2>/dev/null; then
- sed -i 's|\<test "`\([^"]*\) 2>&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
-}
projects / gentoo.git / commitdiff