[patch] ebuild modifications

fix-prefix.patch (text/plain), 13.44 KB, created by tao on 2015-04-14 11:24:52 UTC

--- dev-lang/python/python-3.3.3.ebuild	2015-04-06 18:35:50.000000000 +0200
+++ /rpool/g/usr/local/portage/dev-lang/python/python-3.3.3.ebuild	2015-04-12 22:29:04.858077266 +0200
@@ -63,7 +63,7 @@
 src_prepare() {
 	# Ensure that internal copies of expat, libffi and zlib are not used.
 	rm -fr Modules/expat
-	rm -fr Modules/_ctypes/libffi*
+#	rm -fr Modules/_ctypes/libffi*
 	rm -fr Modules/zlib
 
 	if tc-is-cross-compiler; then
@@ -157,6 +157,12 @@
 
 	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
 
+
+   if [[ ${CHOST} == *-solaris* ]]; then
+        append-ldflags -L/lib -R/lib /lib/libz.so
+        append-libs -lsocket -lnsl 
+    fi
+
 	# https://bugs.gentoo.org/show_bug.cgi?id=50309
 	if is-flagq -O3; then
 		is-flagq -fstack-protector-all && replace-flags -O3 -O2
@@ -202,6 +208,7 @@
 		--with-fpectl \
 		--enable-shared \
 		$(use_enable ipv6) \
+        --disable-ipv6 \
 		$(use_with threads) \
 		--infodir='${prefix}/share/info' \
 		--mandir='${prefix}/share/man' \
@@ -211,7 +218,7 @@
 		--enable-loadable-sqlite-extensions \
 		--with-system-expat \
 		--with-system-ffi \
-		--without-pymalloc
+		--without-pymalloc \
 
 	if use threads && grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
 		eerror "configure has detected that the sem_open function is broken."
--- dev-lang/python/python-2.7.8.ebuild	2015-04-06 18:35:50.000000000 +0200
+++ /rpool/g/usr/local/portage/dev-lang/python/python-2.7.8.ebuild	2015-04-12 22:30:27.834711194 +0200
@@ -212,6 +212,11 @@
 		replace-flags -Os -O3  # comment #14
 	fi
 
+    if [[ ${CHOST} == *-solaris* ]]; then
+        append-ldflags -L/lib -R/lib /lib/libz.so
+        append-libs -lsocket -lnsl
+    fi
+
 	if use prefix ; then
 		# for Python's setup.py not to do false assumptions (only looking in
 		# host paths) we need to make explicit where Prefix stuff is
@@ -219,7 +224,7 @@
 		append-ldflags -L"${EPREFIX}"/$(get_libdir)
 		append-ldflags -L"${EPREFIX}"/usr/$(get_libdir)
 		# fix compilation on some 64-bits Linux hosts, #381163, #473520
-		for hostlibdir in /usr/lib32 /usr/lib64 /usr/lib /lib32 /lib64; do
+		for hostlibdir in /usr/lib32 /usr/lib64 /usr/lib /lib32 /lib64 /lib; do
 			[[ -d ${hostlibdir} ]] || continue
 			append-ldflags -L${hostlibdir}
 		done
@@ -274,6 +279,7 @@
 	econf \
 		--with-fpectl \
 		$(use_enable ipv6) \
+        --disable-ipv6 \
 		$(use_with threads) \
 		$( (use wide-unicode && use !aqua) && echo "--enable-unicode=ucs4" || echo "--enable-unicode=ucs2") \
 		--infodir='${prefix}/share/info' \
--- sys-devel/binutils/binutils-2.24-r2.ebuild	2014-10-14 10:13:55.000000000 +0200
+++ /rpool/g/usr/local/portage/sys-devel/binutils-2.24-r2.ebuild	2015-04-10 11:30:07.289753122 +0200
@@ -27,6 +27,11 @@
 	*-interix*) EXTRA_ECONF="${EXTRA_ECONF} --without-gnu-ld --without-gnu-as" ;;
 	esac
 
+    if [[ ${CHOST} == *-solaris* ]]; then
+        append-ldflags -L/lib -R/lib
+        append-libs -lsocket -lnsl 
+    fi
+
 	toolchain-binutils_src_compile
 }
 
--- dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild	2015-04-13 11:00:04.000000000 +0200
+++ /rpool/g/usr/local/portage/dev-util/pkgconfig/pkgconfig-0.28-r2.ebuild	2015-04-07 12:33:07.000000000 +0200
@@ -68,6 +68,12 @@
 		fi
 	fi
 
+    if [[ ${CHOST} == *-solaris* ]]; then
+        append-libs -lresolv -lsocket -lnsl -lz
+        append-ldflags -L/lib -R/lib /lib/libz.so
+    fi
+
+
 	use ppc64 && use hardened && replace-flags -O[2-3] -O1
 
 	# Force using all the requirements when linking, so that needed -pthread
--- app-arch/tar/tar-1.28.ebuild	2014-08-03 16:22:07.000000000 +0200
+++ /rpool/g/usr/local/portage/app-arch/tar/tar-1.28.ebuild	2015-04-03 11:53:36.000000000 +0200
@@ -33,6 +33,12 @@
 
 src_configure() {
 	use static && append-ldflags -static
+
+    if [[ ${CHOST} == *-solaris* ]]; then
+        append-ldflags -L/lib -R/lib
+        append-libs -lsocket -lnsl
+    fi
+
 	FORCE_UNSAFE_CONFIGURE=1 \
 	econf \
 		--enable-backup-scripts \
--- x11-misc/shared-mime-info/shared-mime-info-1.4.ebuild	2015-04-13 11:00:45.000000000 +0200
+++ /rpool/g/usr/local/portage/x11-misc/shared-mime-info/shared-mime-info-1.4.ebuild	2015-04-13 11:36:24.784380345 +0200
@@ -25,6 +25,10 @@
 
 src_configure() {
 	export ac_cv_func_fdatasync=no #487504
+    
+    if [[ ${CHOST} == *-solaris* ]]; then
+        append-ldflags -R/lib /lib/libz.so
+    fi
 
 	econf \
 		$(use_enable test default-make-check)
--- dev-libs/openssl/openssl-1.0.2a.ebuild	2015-03-20 10:32:45.000000000 +0100
+++ /rpool/g/usr/local/portage/dev-libs/openssl/openssl-1.0.2a.ebuild	2015-04-13 11:37:04.653930432 +0200
@@ -176,6 +176,11 @@
 		;;
 	esac
 
+    if [[ ${CHOST} == *-solaris* ]]; then
+        append-ldflags -R/lib /lib/libz.so
+    fi
+
+
 	# See if our toolchain supports __uint128_t.  If so, it's 64bit
 	# friendly and can use the nicely optimized code paths. #460790
 	local ec_nistp_64_gcc_128
--- dev-libs/glib/glib-2.42.1.ebuild	2014-12-30 20:06:29.000000000 +0100
+++ /rpool/g/usr/local/portage/dev-libs/glib/glib-2.42.1.ebuild	2015-04-12 19:04:56.866080003 +0200
@@ -241,6 +241,11 @@
 	local mythreads=posix
 	[[ ${CHOST} == *-winnt* ]] && mythreads=win32
 
+    if [[ ${CHOST} == *-solaris* ]]; then
+        append-libs -lresolv -lsocket -lnsl -lz
+        append-ldflags -L/lib
+    fi
+
 	# Only used by the gresource bin
 	multilib_is_native_abi || myconf="${myconf} --disable-libelf"
 
@@ -253,7 +258,7 @@
 		$(use_enable systemtap dtrace) \
 		$(use_enable systemtap systemtap) \
 		--disable-compile-warnings \
-		--enable-man \
+		--disable-man \
 		--with-pcre=internal \
 		--with-threads=${mythreads} \
 		--with-xml-catalog="${EPREFIX}/etc/xml/catalog"
--- dev-libs/libffi/libffi-3.2.1.ebuild	2015-01-18 20:35:55.000000000 +0100
+++ /rpool/g/usr/local/portage/dev-libs/libffi/libffi-3.2.1.ebuild	2015-04-13 11:37:51.234394011 +0200
@@ -47,6 +47,11 @@
 
 multilib_src_configure() {
 	use userland_BSD && export HOST="${CHOST}"
+
+    if [[ ${CHOST} == *-solaris* ]]; then
+        append-ldflags -R/lib /lib/libz.so
+    fi
+
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable pax_kernel pax_emutramp) \
--- dev-libs/libxml2/libxml2-2.9.2.ebuild	2015-04-08 19:58:53.000000000 +0200
+++ /rpool/g/usr/local/portage/dev-libs/libxml2/libxml2-2.9.2.ebuild	2015-04-12 23:10:50.942895510 +0200
@@ -105,6 +105,12 @@
 	# switch (enabling the libxml2 debug module). See bug #100898.
 
 	# --with-mem-debug causes unusual segmentation faults (bug #105120).
+    
+    if [[ ${CHOST} == *-solaris* ]]; then
+        append-cppflags -DNO_LARGEFILE_SOURCE
+        append-ldflags /lib/libz.so -L/lib -R/lib
+        append-libs -lsocket -lnsl
+    fi
 
 	libxml2_configure() {
 		ECONF_SOURCE="${S}" econf \
--- dev-libs/libxslt/libxslt-1.1.28-r4.ebuild	2015-04-08 19:58:53.000000000 +0200
+++ /rpool/g/usr/local/portage/dev-libs/libxslt/libxslt-1.1.28-r4.ebuild	2015-04-13 11:38:06.133295057 +0200
@@ -7,7 +7,7 @@
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE="xml"
 
-inherit autotools eutils python-r1 toolchain-funcs multilib-minimal
+inherit autotools eutils python-r1 toolchain-funcs multilib-minimal flag-o-matic
 
 DESCRIPTION="XSLT libraries and tools"
 HOMEPAGE="http://www.xmlsoft.org/"
@@ -59,7 +59,12 @@
 #	elibtoolize
 }
 
-multilib_src_configure() {
+multilib_src_configure() { 
+    
+    if [[ ${CHOST} == *-solaris* ]]; then
+        append-ldflags -R/lib /lib/libz.so
+    fi    
+
 	libxslt_configure() {
 		ECONF_SOURCE=${S} econf \
 			$(use_enable static-libs static) \
--- sys-apps/coreutils/coreutils-8.23-r00.1.ebuild	2015-02-16 13:06:27.000000000 +0100
+++ /rpool/g/usr/local/portage/sys-apps/coreutils/coreutils-8.23-r00.1.ebuild	2015-04-10 11:20:02.099277788 +0200
@@ -94,6 +94,11 @@
 		myconf="${myconf} --enable-no-install-program=groups,hostname,kill,su,uptime"
 	fi
 
+    if [[ ${CHOST} == *-solaris* ]]; then
+        append-ldflags -L/lib -R/lib
+        append-libs -lsocket -lnsl
+    fi
+
 	econf \
 		--with-packager="Gentoo" \
 		--with-packager-version="${PVR} (p${PATCH_VER:-0})" \
--- sys-apps/coreutils/coreutils-8.23.ebuild	2014-11-02 21:48:51.000000000 +0100
+++ /rpool/g/usr/local/portage/sys-apps/coreutils/coreutils-8.23.ebuild	2015-04-03 11:05:49.000000000 +0200
@@ -93,6 +93,11 @@
 		myconf="${myconf} --enable-no-install-program=groups,hostname,kill,su,uptime"
 	fi
 
+    if [[ ${CHOST} == *-solaris* ]]; then
+        append-ldflags -L/lib -R/lib
+        append-libs -lsocket -lnsl 
+    fi
+
 	econf \
 		--with-packager="Gentoo" \
 		--with-packager-version="${PVR} (p${PATCH_VER:-0})" \
--- sys-apps/gawk/gawk-4.1.1-r1.ebuild	2015-03-31 22:31:19.000000000 +0200
+++ /rpool/g/usr/local/portage/sys-apps/gawk/gawk-4.1.1-r1.ebuild	2015-04-03 12:13:44.000000000 +0200
@@ -24,6 +24,7 @@
 	EPATCH_OPTS="-Z" \
 	epatch "${FILESDIR}"/${P}-sandbox_issue.patch
 	epatch "${FILESDIR}"/${P}-sigpipe.patch #507340
+    epatch "${FILESDIR}"/${P}-build-without-socket.patch
 
 	# use symlinks rather than hardlinks, and disable version links
 	sed -i \
--- /rpool/g/usr/portage/sys-apps/gawk/files/gawk-4.1.1-build-without-socket.patch	1970-01-01 01:00:00.000000000 +0100
+++ /rpool/g/usr/local/portage/sys-apps/gawk/files/gawk-4.1.1-build-without-socket.patch	2015-04-03 12:13:55.000000000 +0200
@@ -0,0 +1,16 @@
+--- gawk-4.1.1/io.c.orig        2014-03-05 04:00:36.000000000 +0000
++++ gawk-4.1.1/io.c     2014-04-09 14:40:40.000000000 +0100
+@@ -166,6 +166,12 @@
+ # define SOCKET                        int
+ #endif
+ 
++#else /* HAVE_SOCKETS */
++
++#ifndef closemaybesocket
++# define closemaybesocket(fd)  close(fd)
++#endif
++
+ #endif /* HAVE_SOCKETS */
+ 
+ #ifndef HAVE_SETSID
+
--- net-misc/wget/wget-1.16.ebuild	2014-11-09 10:38:33.000000000 +0100
+++ /rpool/g/usr/local/portage/net-misc/wget/wget-1.16.ebuild	2015-04-08 11:31:11.000000000 +0200
@@ -62,6 +62,13 @@
 	# the included gnutls -- force ioctl.h to include this header
 	[[ ${CHOST} == *-solaris* ]] && append-flags -DBSD_COMP=1
 
+        
+    if [[ ${CHOST} == *-solaris* ]]; then
+        append-ldflags -L/lib -R/lib
+        append-libs -lsocket -lnsl
+    fi  
+
+
 	if use static ; then
 		append-ldflags -static
 		tc-export PKG_CONFIG
--- net-misc/wget/wget-1.16.3.ebuild	2015-03-09 18:46:59.000000000 +0100
+++ /rpool/g/usr/local/portage/net-misc/wget/wget-1.16.3.ebuild	2015-04-13 11:28:06.674675861 +0200
@@ -56,6 +56,13 @@
 		tc-export PKG_CONFIG
 		PKG_CONFIG+=" --static"
 	fi
+
+    if [[ ${CHOST} == *-solaris* ]]; then
+        append-ldflags -R/lib /lib/libz.so
+        append-libs -lsocket -lnsl
+    fi
+
+
 	econf \
 		--disable-assert \
 		--disable-rpath \
--- net-misc/rsync/rsync-3.1.1.ebuild	2015-03-16 05:58:41.000000000 +0100
+++ /rpool/g/usr/local/portage/net-misc/rsync/rsync-3.1.1.ebuild	2015-04-13 11:38:19.761973659 +0200
@@ -30,6 +35,11 @@
 }
 
 src_configure() {
+    if [[ ${CHOST} == *-solaris* ]]; then
+        append-ldflags -R/lib /lib/libz.so 
+        append-libs -lsocket -lnsl
+    fi
+
 	use static && append-ldflags -static
 	econf \
 		--without-included-popt \
--- net-misc/openssh/openssh-6.8_p1-r1.ebuild	2015-03-20 10:32:45.000000000 +0100
+++ /rpool/g/usr/local/portage/net-misc/openssh/openssh-6.8_p1-r1.ebuild	2015-04-10 17:33:21.270663914 +0200
@@ -213,6 +213,12 @@
 		append-ldflags -lutil
 	fi
 
+    if [[ ${CHOST} == *-solaris* ]]; then
+        myconf+=( --without-openssl-header-check )
+        append-ldflags -L/lib -R/lib
+    fi
+
+
 	econf "${myconf[@]}"
 }
 
--- app-editors/nano/nano-2.4.0.ebuild	2015-03-28 08:58:08.000000000 +0100
+++ /rpool/g/usr/local/portage/app-editors/nano/nano-2.4.0.ebuild	2015-04-10 12:58:27.977489412 +0200
@@ -31,6 +31,7 @@
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-no-speller.patch #544296
+    epatch "${FILESDIR}"/${P}-time_t.patch
 	epatch_user
 }
 
--- /rpool/g/usr/portage/app-editors/nano/files/nano-2.4.0-time_t.patch	1970-01-01 01:00:00.000000000 +0100
+++ /rpool/g/usr/local/portage/app-editors/nano/files/nano-2.4.0-time_t.patch	2015-04-10 13:02:35.209533838 +0200
@@ -0,0 +1,14 @@
+--- a/src/text.c	2015-04-10 12:45:47.406423123 +0200
++++ b/src/text.c	2015-04-10 12:49:18.313061644 +0200
+@@ -31,6 +31,11 @@
+ #include <sys/wait.h>
+ #include <errno.h>
+ 
++#if (defined(__APPLE__) && defined(__MACH__)) || (defined(__sun) && defined(__SVR4))
++#undef __time_t
++#define __time_t time_t
++#endif
++
+ #ifndef NANO_TINY
+ static pid_t pid = -1;
+ 	/* The PID of the forked process in execute_command(), for use
--- media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild	2014-08-17 09:52:58.000000000 +0200
+++ /rpool/g/usr/local/portage/media-libs/jbig2enc/jbig2enc-0.28-r1.ebuild	2015-04-14 12:30:41.551139984 +0200
@@ -27,6 +27,8 @@
 	sed -i -e '/AM_INIT_AUTOMAKE/s/-Werror//' configure.ac || die 'sed on configure.ac failed'
 	# prevent static linking and QA notice about insecure RUNPATHs
 	sed -i -e '/jbig2_LDFLAGS/d' src/Makefile.am || die 'sed on src/Makefile.am failed'
+    # pdf.py is wrtitten in python2
+    sed -i 's/#!\/usr\/bin\/python/#!\/usr\/bin\/python2/' pdf.py || die 'sed on pdf.py failed'
 
 	autotools-utils_src_prepare
 }
--- media-libs/leptonica/leptonica-1.71-r1.ebuild	2015-02-24 10:04:49.000000000 +0100
+++ /rpool/g/usr/local/portage/media-libs/leptonica/leptonica-1.71-r1.ebuild	2015-04-14 12:12:23.963073780 +0200
@@ -5,7 +5,7 @@
 EAPI=5
 
 AUTOTOOLS_AUTORECONF="1"
-inherit eutils autotools-utils
+inherit eutils autotools-utils flag-o-matic
 
 DESCRIPTION="C library for image processing and analysis"
 HOMEPAGE="http://code.google.com/p/leptonica/"
@@ -49,6 +49,10 @@
 }
 
 src_configure() {
+    if [[ ${CHOST} == *-solaris* ]]; then
+        append-cppflags -D__SOLARIS__ 
+    fi
+
 	# $(use_with webp libwebp) -> unknown
 	# so use-flag just for pulling dependencies
 	# zlib handling see bug 454890