cccdlflags for static archives patch

5 files changed, 352 insertions, 2 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index d7a976e4d952..3f74bf87aa67 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.45 2003/11/26 22:16:43 rac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.46 2003/11/29 22:13:07 rac Exp $
+
+*perl-5.8.2-r1 (29 Nov 2003)
+
+  29 Nov 2003; <rac@gentoo.org> perl-5.8.2-r1.ebuild,
+  files/perl-5.8.2-picdl.patch:
+  Make CCCDLFLAGS apply to static archives like DynaLoader.a as well, even
+  though we are not building a shared libperl here, because we do have a shared
+  library elsewhere. Should make it so that arches like amd64 and hppa no longer
+  have to add -fPIC to all cflags blindly.
 
   26 Nov 2003; <rac@gentoo.org> perl-5.8.2.ebuild:
   Make perl depend on exact same libperl version, so that upgrading perl will
diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest
index 3767c0bb10f4..61190132d9f4 100644
--- a/dev-lang/perl/Manifest
+++ b/dev-lang/perl/Manifest
@@ -1,3 +1,4 @@
+MD5 824eb749756088b9ee0020b5f92c4886 perl-5.8.2-r1.ebuild 9941
 MD5 228f894d40b3f16fc9c0987211dbe77a perl-5.8.2.ebuild 9446
 MD5 5e2ced5e0d331faea9122a21c49957b0 perl-5.6.1-r12.ebuild 7089
 MD5 6fa918519f79045619ee131c5cd6b38b perl-5.8.1-r1.ebuild 8736
@@ -6,7 +7,7 @@ MD5 907c3574f85470b1f2148180f7321f20 perl-5.8.0-r9.ebuild 13534
 MD5 220bd838139aaf17ec8f8f6cc1a37c61 perl-5.8.0-r12.ebuild 10316
 MD5 33226bb561cd0f81cc4f7756c0f7f4c5 perl-5.6.1-r11.ebuild 6141
 MD5 039399151aff0b9074381e9dc831f52a perl-5.8.1-r2.ebuild 9144
-MD5 8c6e2814cd47a9cdc6ca5c173bbe2ba2 ChangeLog 20722
+MD5 ec496a52af2218146e03c348ccaf077d ChangeLog 21118
 MD5 31f5ae7d2343aa4819b892820b0ccaf7 perl-5.8.0-r11.ebuild 9890
 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
 MD5 0339818063f904e5a6ebe6b16b4d819f perl-5.6.1-r10.ebuild 6666
@@ -34,9 +35,11 @@ MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.1_rc1-reorder-INC.patch 2211
 MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.1-prelink-lpthread.patch 476
 MD5 4e99f7529e149661372283c981cf17ff files/perl-5.8.0-prelink-lpthread.patch 476
 MD5 803b7c028f59008ea1e6d577e5c0bab0 files/stat.t 8884
+MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-5.8.2-picdl.patch 250
 MD5 cc61dca6d96347b5d93cfdde1514feb4 files/digest-perl-5.8.0-r9 860
 MD5 3ec3358c13c85372c9a668f361d1f244 files/digest-perl-5.8.1-r1 64
 MD5 3ec3358c13c85372c9a668f361d1f244 files/digest-perl-5.8.1-r2 64
+MD5 8381e239056a7895edf8f3c6c05c835c files/digest-perl-5.8.2-r1 64
 MD5 d9412dab085f22309997c8f08ea1ac85 files/perl-5.8.1-reorder-INC.patch 2211
 MD5 393b3dff879c892d461901183d3b0055 files/perl-5.8.0-sockatmark-should-__THROW.patch 402
 MD5 d2af75f06a64c5934db314ff38939cdd files/libperl-5.8.0-create-libperl-soname.patch 424
diff --git a/dev-lang/perl/files/digest-perl-5.8.2-r1 b/dev-lang/perl/files/digest-perl-5.8.2-r1
new file mode 100644
index 000000000000..03c9dcc55731
--- /dev/null
+++ b/dev-lang/perl/files/digest-perl-5.8.2-r1
@@ -0,0 +1 @@
+MD5 fa356b74f99166b63a68a322c3c68f91 perl-5.8.2.tar.gz 11896287
diff --git a/dev-lang/perl/files/perl-5.8.2-picdl.patch b/dev-lang/perl/files/perl-5.8.2-picdl.patch
new file mode 100644
index 000000000000..f69a6800cf48
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.2-picdl.patch
@@ -0,0 +1,13 @@
+--- Makefile.SH.orig	2003-11-29 01:16:15.000000000 -0800
++++ Makefile.SH	2003-11-29 01:16:52.000000000 -0800
+@@ -129,8 +129,8 @@
+ 
+ 	;;
+ 
+-*)	pldlflags=''
+-	static_target='static'
++*)	pldlflags="$cccdlflags"
++	static_target='static_pic'
+ 	;;
+ esac
+ 
diff --git a/dev-lang/perl/perl-5.8.2-r1.ebuild b/dev-lang/perl/perl-5.8.2-r1.ebuild
new file mode 100644
index 000000000000..7cf11f448677
--- /dev/null
+++ b/dev-lang/perl/perl-5.8.2-r1.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.2-r1.ebuild,v 1.1 2003/11/29 22:13:07 rac Exp $
+
+inherit eutils flag-o-matic
+
+# Perl has problems compiling with -Os in your flags
+replace-flags "-Os" "-O2"
+# This flag makes compiling crash in interesting ways
+filter-flags -malign-double
+
+# The slot of this binary compat version of libperl.so
+PERLSLOT="1"
+
+SHORT_PV="`echo ${PV} | cut -d. -f1,2`"
+DESCRIPTION="Larry Wall's Practical Extraction and Reporting Language"
+SAFE_VERSION="2.09"
+MY_P="perl-`echo $PV | sed 's/_rc/-RC/'`"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="ftp://ftp.perl.org/pub/CPAN/src/${MY_P}.tar.gz"
+#ftp://ftp.perl.org/pub/CPAN/modules/by-module/DB_File/DB_File-${DB_FILE_VERSION}.tar.gz
+#ftp://ftp.perl.org/pub/CPAN/modules/by-module/Safe/Safe-${SAFE_VERSION}.tar.gz"
+HOMEPAGE="http://www.perl.org/"
+SLOT="0"
+LIBPERL="libperl.so.${PERLSLOT}.${SHORT_PV}"
+LICENSE="Artistic GPL-2"
+KEYWORDS="~x86 amd64 ~sparc ~ppc ~alpha ~mips ~hppa ~ia64"
+IUSE="berkdb doc gdbm threads"
+
+DEPEND="sys-apps/groff
+	berkdb? ( sys-libs/db )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )
+	>=sys-apps/portage-2.0.48-r4
+	>=sys-devel/libperl-${PV}
+	!<dev-perl/ExtUtils-MakeMaker-6.05-r6
+	!<dev-perl/File-Spec-0.84-r1
+	!<dev-perl/Test-Simple-0.47-r1"
+RDEPEND="berkdb? ( sys-libs/db )
+	gdbm? ( >=sys-libs/gdbm-1.8.0 )"
+
+pkg_setup() {
+	# I think this should rather be displayed if you *have* 'threads'
+	# in USE if it could break things ...
+	if [ -n "`use threads`" ]
+	then
+		ewarn ""
+		ewarn "PLEASE NOTE: You are compiling perl-5.8 with"
+		ewarn "threading enabled."
+		ewarn "Threading is not supported by all applications "
+		ewarn "that compile against perl. You use threading at "
+		ewarn "your own discretion. "
+		ewarn ""
+		sleep 10
+	else
+		ewarn ""
+		ewarn "PLEASE NOTE: If you want to compile perl-5.8 with"
+		ewarn "threading enabled , you must restart this emerge"
+		ewarn "with USE=threads emerge...."
+		ewarn "Threading is not supported by all applications "
+		ewarn "that compile against perl. You use threading at "
+		ewarn "your own discretion. "
+		ewarn ""
+	fi
+
+	if [ ! -f /usr/lib/${LIBPERL} ]
+	then
+		# Make sure we have libperl installed ...
+		eerror "Cannot find /usr/lib/${LIBPERL}!  Make sure that you"
+		eerror "have sys-libs/libperl installed properly ..."
+		die "Cannot find /usr/lib/${LIBPERL}!"
+	fi
+}
+
+src_unpack() {
+
+	unpack ${A}
+
+	# Get -lpthread linked before -lc.  This is needed
+	# when using glibc >= 2.3, or else runtime signal
+	# handling breaks.  Fixes bug #14380.
+	# <rac@gentoo.org> (14 Feb 2003)
+	# reinstated to try to avoid sdl segfaults 03.10.02
+	cd ${S}; epatch ${FILESDIR}/${P}-prelink-lpthread.patch
+
+	# Patch perldoc to not abort when it attempts to search
+	# nonexistent directories; fixes bug #16589.
+	# <rac@gentoo.org> (28 Feb 2003)
+
+	cd ${S}; epatch ${FILESDIR}/${P}-perldoc-emptydirs.patch
+
+	# this lays the groundwork for solving the issue of what happens
+	# when people (or ebuilds) install different versiosn of modules
+	# that are in the core, by rearranging the @INC directory to look
+	# site -> vendor -> core.
+	cd ${S}; epatch ${FILESDIR}/${P}-reorder-INC.patch
+
+	# some well-intentioned stuff in http://groups.google.com/groups?hl=en&lr=&ie=UTF-8&selm=Pine.SOL.4.10.10205231231200.5399-100000%40maxwell.phys.lafayette.edu
+	# attempts to avoid bringing cccdlflags to bear on static
+	# extensions (like DynaLoader).  i believe this is
+	# counterproductive on a Gentoo system which has both a shared
+	# and static libperl, so effectively revert this here.
+	cd ${S}; epatch ${FILESDIR}/${P}-picdl.patch
+}
+
+src_compile() {
+
+	export LC_ALL="C"
+	local myconf=""
+
+	if [ "`use threads`" ]
+	then
+		einfo "using threads"
+		mythreading="-multi"
+		myconf="-Dusethreads ${myconf}"
+		myarch="${CHOST%%-*}-linux-thread"
+	else
+		myarch="${CHOST%%-*}-linux"
+	fi
+
+	if [ "`use gdbm`" ]
+	then
+		myconf="${myconf} -Di_gdbm"
+	fi
+	if [ "`use berkdb`" ]
+	then
+		myconf="${myconf} -Di_db"
+
+		# ndbm.h is only provided by db1 (and perhaps by gdbm in
+		# error). an alternate approach here would be to check for the
+		# presence (or some string therein) of /usr/include/ndbm.h
+		# itself.
+
+		if has_version '=sys-libs/db-1*'
+		then
+			myconf="${myconf} -Di_ndbm"
+		else
+			myconf="${myconf} -Ui_ndbm"
+		fi
+	else
+		myconf="${myconf} -Ui_db -Ui_ndbm"
+	fi
+	if [ "`use mips`" ]
+	then
+		# this is needed because gcc 3.3-compiled kernels will hang
+		# the machine trying to run this test - check with `Kumba
+		# <rac@gentoo.org> 2003.06.26
+		myconf="${myconf} -Dd_u32align"
+	fi
+	if [ "`use sparc`" ]
+	then
+		myconf="${myconf} -Ud_longdbl"
+	fi
+	if [ "`use sparc64`" ]
+	then
+		myconf="${myconf} -Ud_longdbl"
+	fi
+
+	if [ "`use alpha`" -a "${CC}" == "ccc" ]
+	then
+		ewarn "Perl will not be built with berkdb support, use gcc if you needed it..."
+		myconf="${myconf} -Ui_db -Ui_ndbm"
+	fi
+
+	# These are temporary fixes. Need to edit the build so that that libraries created
+	# only get compiled with -fPIC, since they get linked into shared objects, they
+	# must be compiled with -fPIC.  Don't have time to parse through the build system
+	# at this time.
+	[ "${ARCH}" = "hppa" ] && append-flags -fPIC
+#	[ "${ARCH}" = "amd64" ] && append-flags -fPIC
+
+	sh Configure -des \
+		-Darchname="${myarch}" \
+		-Dcccdlflags='-fPIC' \
+		-Dccdlflags='-rdynamic' \
+		-Dcc="${CC:-gcc}" \
+		-Dprefix='/usr' \
+		-Dvendorprefix='/usr' \
+		-Dsiteprefix='/usr' \
+		-Dlocincpth=' ' \
+		-Doptimize="${CFLAGS}" \
+		-Duselargefiles \
+		-Dd_dosuid \
+		-Dd_semctl_semun \
+		-Dscriptdir=/usr/bin \
+		-Dman3ext='3pm' \
+		-Dcf_by='Gentoo' \
+		-Ud_csh \
+		${myconf} || die "Unable to configure"
+
+	MAKEOPTS="${MAKEOPTS} -j1" emake || die "Unable to make"
+
+	emake -i test CCDLFLAGS=
+}
+
+src_install() {
+
+	export LC_ALL="C"
+
+	# Need to do this, else apps do not link to dynamic version of
+	# the library ...
+	local coredir="/usr/lib/perl5/${PV}/${myarch}${mythreading}/CORE"
+	dodir ${coredir}
+	dosym ../../../../${LIBPERL} ${coredir}/${LIBPERL}
+	dosym ../../../../${LIBPERL} ${coredir}/libperl.so.${PERLSLOT}
+	dosym ../../../../${LIBPERL} ${coredir}/libperl.so
+
+	# Fix for "stupid" modules and programs
+	dodir /usr/lib/perl5/site_perl/${PV}/${myarch}${mythreading}
+
+	make DESTDIR="${D}" \
+		INSTALLMAN1DIR="${D}/usr/share/man/man1" \
+		INSTALLMAN3DIR="${D}/usr/share/man/man3" \
+		install || die "Unable to make install"
+
+	cp -f utils/h2ph utils/h2ph_patched
+	epatch ${FILESDIR}/perl-5.8.0-RC2-special-h2ph-not-failing-on-machine_ansi_header.patch
+
+	LD_LIBRARY_PATH=. ./perl -Ilib utils/h2ph_patched \
+		-a -d ${D}/usr/lib/perl5/${PV}/${myarch}${mythreading} <<EOF
+asm/termios.h
+syscall.h
+syslimits.h
+syslog.h
+sys/ioctl.h
+sys/socket.h
+sys/time.h
+wait.h
+EOF
+
+	# This is to fix a missing c flag for backwards compat
+	for i in `find ${D}/usr/lib/perl5 -iname "Config.pm"`;do
+		sed -e "s:ccflags=':ccflags='-DPERL5 :" \
+		    -e "s:cppflags=':cppflags='-DPERL5 :" \
+			${i} > ${i}.new &&\
+			mv ${i}.new ${i} || die "Sed failed"
+	done
+
+	# A poor fix for the miniperl issues
+	dosed 's:./miniperl:/usr/bin/perl:' /usr/lib/perl5/${PV}/ExtUtils/xsubpp
+	fperms 0444 /usr/lib/perl5/${PV}/ExtUtils/xsubpp
+	dosed 's:./miniperl:/usr/bin/perl:' /usr/bin/xsubpp
+	fperms 0755 /usr/bin/xsubpp
+
+	./perl installman \
+		--destdir="${D}" --man1ext='1' --man3ext='3'
+
+	# This removes ${D} from Config.pm and .packlist
+	for i in `find ${D} -iname "Config.pm"` `find ${D} -iname ".packlist"`;do
+		einfo "Removing ${D} from ${i}..."
+		sed -e "s:${D}::" ${i} > ${i}.new &&\
+			mv ${i}.new ${i} || die "Sed failed"
+	done
+
+	dodoc Changes* Artistic Copying README Todo* AUTHORS
+
+	if [ -n "`use doc`" ]
+	then
+		# HTML Documentation
+		# We expect errors, warnings, and such with the following.
+
+		dodir /usr/share/doc/${PF}/html
+		./perl installhtml \
+			--podroot='.' \
+			--podpath='lib:ext:pod:vms' \
+			--recurse \
+			--htmldir="${D}/usr/share/doc/${PF}/html" \
+			--libpods='perlfunc:perlguts:perlvar:perlrun:perlop'
+	fi
+}
+
+pkg_postinst() {
+
+	# Make sure we do not have stale/invalid libperl.so 's ...
+	if [ -f "${ROOT}usr/lib/libperl.so" -a ! -L "${ROOT}usr/lib/libperl.so" ]
+	then
+		mv -f ${ROOT}usr/lib/libperl.so ${ROOT}usr/lib/libperl.so.old
+	fi
+
+	local perllib="`readlink -f ${ROOT}usr/lib/libperl.so | sed -e 's:^.*/::'`"
+
+	# If we are installing perl, we need the /usr/lib/libperl.so symlink to
+	# point to the version of perl we are running, else builing something
+	# against libperl.so will break ...
+	if [ "${perllib}" != "${LIBPERL}" ]
+	then
+		# Delete stale symlinks
+		rm -f ${ROOT}usr/lib/libperl.so
+		rm -f ${ROOT}usr/lib/libperl.so.${PERLSLOT}
+		# Regenerate libperl.so.${PERLSLOT}
+		ln -snf ${LIBPERL} ${ROOT}usr/lib/libperl.so.${PERLSLOT}
+		# Create libperl.so (we use the *soname* versioned lib here ..)
+		ln -snf libperl.so.${PERLSLOT} ${ROOT}usr/lib/libperl.so
+	fi
+
+	if [ "${ROOT}" = "/" ]
+	then
+		ebegin "Converting C header files to the corresponding Perl format"
+		cd /usr/include; find ./ -name "*.h" -type f -exec h2ph {} \;
+	fi
+
+	eerror ""
+	eerror "If this is an upgrade to a perl 5.6.1 system,"
+	eerror "~OR~ an upgrade to a previous Gentoo release"
+	eerror "of perl 5.8.0, prior to -r8 "
+	eerror "you may need to recompile applications that"
+	eerror "were emerged against the old libperl.so"
+	eerror ""
+	eerror "${FILESDIR}/libperl_rebuilder "
+	eerror "is provided to assist with this. "
+	eerror "PLEASE DO NOT INTERRUPT THE RUNNING OF THIS SCRIPT."
+	eerror "Part of the rebuilding of applications compiled against "
+	eerror "your old libperl involves temporarily unmerging"
+	eerror "them - interruptions could leave you with unmerged"
+	eerror "packages before they can be remerged."
+	eerror ""
+	eerror "If you have run the rebuilder and a package still gives"
+	eerror "you trouble, and re-emerging it fails to correct"
+	eerror "the problem, please check http://bugs.gentoo.org/"
+	eerror "for more information or to report a bug."
+	eerror ""
+	eerror ""
+}
+
+