From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A9EC71381F3 for ; Thu, 19 Sep 2013 22:24:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44DFAE0CD0; Thu, 19 Sep 2013 22:24:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BE57AE0CD0 for ; Thu, 19 Sep 2013 22:24:21 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A83D433EB61 for ; Thu, 19 Sep 2013 22:24:20 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 34BA0E530A for ; Thu, 19 Sep 2013 22:24:18 +0000 (UTC) From: "Francois Bissey" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Francois Bissey" Message-ID: <1379629430.524d24de78b5b5f4d671227af448c4ca4fd8f610.fbissey@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/modglue/files/, sci-libs/modglue/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/modglue/ChangeLog sci-libs/modglue/files/modglue-1.16-lib64.patch sci-libs/modglue/files/modglue-1.19-Makefiles.patch sci-libs/modglue/files/modglue-1.19-ldflags.patch sci-libs/modglue/files/modglue-1.19-parallelmake.patch sci-libs/modglue/modglue-1.19.ebuild X-VCS-Directories: sci-libs/modglue/files/ sci-libs/modglue/ X-VCS-Committer: fbissey X-VCS-Committer-Name: Francois Bissey X-VCS-Revision: 524d24de78b5b5f4d671227af448c4ca4fd8f610 X-VCS-Branch: master Date: Thu, 19 Sep 2013 22:24:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8020c57a-1a5d-430b-af37-14fdab9cf979 X-Archives-Hash: f002fb38b365998bbc8c9f866d8e49f8 commit: 524d24de78b5b5f4d671227af448c4ca4fd8f610 Author: François Bissey canterbury ac nz> AuthorDate: Thu Sep 19 22:16:54 2013 +0000 Commit: Francois Bissey massey ac nz> CommitDate: Thu Sep 19 22:23:50 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=524d24de Fixing sandbox violations Package-Manager: portage-2.2.6 --- sci-libs/modglue/ChangeLog | 6 ++ sci-libs/modglue/files/modglue-1.16-lib64.patch | 61 ----------- .../modglue/files/modglue-1.19-Makefiles.patch | 113 +++++++++++++++++++++ sci-libs/modglue/files/modglue-1.19-ldflags.patch | 14 --- .../modglue/files/modglue-1.19-parallelmake.patch | 53 ---------- sci-libs/modglue/modglue-1.19.ebuild | 9 +- 6 files changed, 121 insertions(+), 135 deletions(-) diff --git a/sci-libs/modglue/ChangeLog b/sci-libs/modglue/ChangeLog index bc9c7e4..36095f3 100644 --- a/sci-libs/modglue/ChangeLog +++ b/sci-libs/modglue/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 19 Sep 2013; François Bissey + +files/modglue-1.19-Makefiles.patch, -files/modglue-1.16-lib64.patch, + -files/modglue-1.19-ldflags.patch, -files/modglue-1.19-parallelmake.patch, + modglue-1.19.ebuild: + Fixing sandbox violations + *modglue-1.19 (18 Sep 2013) 18 Sep 2013; François Bissey diff --git a/sci-libs/modglue/files/modglue-1.16-lib64.patch b/sci-libs/modglue/files/modglue-1.16-lib64.patch deleted file mode 100644 index e67adba..0000000 --- a/sci-libs/modglue/files/modglue-1.16-lib64.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- Makefile.in.orig 2010-03-04 10:34:54.000000000 +1300 -+++ Makefile.in 2010-08-23 23:21:34.931886424 +1200 -@@ -3,6 +3,9 @@ - - .PHONY: all install library static examples uninstall clean distclean - -+prefix = @prefix@ -+exec_prefix = @exec_prefix@ -+ - all: library - #examples - -@@ -17,8 +20,8 @@ - - install: - ( cd src && $(MAKE) install ); -- @INSTALL@ -d -m 755 ${DESTDIR}@prefix@/@libdir@/pkgconfig -- @INSTALL@ -m 644 modglue.pc ${DESTDIR}@prefix@/@libdir@/pkgconfig/ -+ @INSTALL@ -d -m 755 ${DESTDIR}@libdir@/pkgconfig -+ @INSTALL@ -m 644 modglue.pc ${DESTDIR}@libdir@/pkgconfig/ - @INSTALL@ -d -m 755 ${DESTDIR}@prefix@/share/man/man1 - @INSTALL@ man/man1/prompt.1 ${DESTDIR}@prefix@/share/man/man1 - @INSTALL@ man/man1/ptywrap.1 ${DESTDIR}@prefix@/share/man/man1 ---- src/Makefile.in.orig 2010-03-04 10:34:54.000000000 +1300 -+++ src/Makefile.in 2010-08-23 23:21:41.165883457 +1200 -@@ -1,6 +1,8 @@ - - - MACTEST= @MAC_OS_X@ -+prefix = @prefix@ -+exec_prefix = @exec_prefix@ - - ifeq ($(strip $(MACTEST)),) - LIBTOOL = libtool -@@ -18,7 +20,7 @@ - LPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ -version-info ${LTRELEASE} -rpath @prefix@/@libdir@ @LIBS@ - MPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ - IPHASE = ${LIBTOOL} --mode=install @INSTALL@ --FPHASE = ${LIBTOOL} --mode=finish @prefix@/@libdir@ -+FPHASE = ${LIBTOOL} --mode=finish @libdir@ - - TIMESTAMP = -D"DATETIME=\"`date | sed -e 's/ / /'`\"" -DHOSTNAME=\"`hostname`\" - -@@ -98,13 +100,13 @@ - - install: library tools - @INSTALL@ -m 755 -d ${DESTDIR}@prefix@ -- @INSTALL@ -m 755 -d ${DESTDIR}@prefix@/@libdir@ -- @INSTALL@ -m 755 -d ${DEVDESTDIR}@prefix@/@libdir@ -+ @INSTALL@ -m 755 -d ${DESTDIR}@libdir@ -+ @INSTALL@ -m 755 -d ${DEVDESTDIR}@libdir@ - @INSTALL@ -m 755 -d ${DESTDIR}@prefix@/bin - @INSTALL@ -m 755 -d ${DEVDESTDIR}@prefix@/include/modglue -- ${IPHASE} libmodglue.la ${DESTDIR}@prefix@/@libdir@ -+ ${IPHASE} libmodglue.la ${DESTDIR}@libdir@ - ifneq ($(DESTDIR),$(DEVDESTDIR)) -- mv ${DESTDIR}@prefix@/@libdir@/libmodglue*.so ${DEVDESTDIR}@prefix@/@libdir@ -+ mv ${DESTDIR}@libdir@/libmodglue*.so ${DEVDESTDIR}@libdir@ - endif - # ${IPHASE} libmid.la ${DESTDIR}@prefix@/lib - ${FPHASE} diff --git a/sci-libs/modglue/files/modglue-1.19-Makefiles.patch b/sci-libs/modglue/files/modglue-1.19-Makefiles.patch new file mode 100644 index 0000000..a1dae99 --- /dev/null +++ b/sci-libs/modglue/files/modglue-1.19-Makefiles.patch @@ -0,0 +1,113 @@ +--- Makefile.in.orig 2013-02-24 11:18:44.000000000 +1300 ++++ Makefile.in 2013-09-20 10:05:25.316018672 +1200 +@@ -3,12 +3,15 @@ + + .PHONY: all install library static examples uninstall clean distclean + ++prefix = @prefix@ ++exec_prefix = @exec_prefix@ ++ + all: library + #examples + + library: + echo @libdir@ +- ( cd src && $(MAKE) ); ++ ( cd src $(MAKE) library tools ); + + static: + ( cd src && $(MAKE) static ); +@@ -18,8 +21,8 @@ + + install: + ( cd src && $(MAKE) install ); +- @INSTALL@ -d -m 755 ${DESTDIR}@prefix@/@libdir@/pkgconfig +- @INSTALL@ -m 644 modglue.pc ${DESTDIR}@prefix@/@libdir@/pkgconfig/ ++ @INSTALL@ -d -m 755 ${DESTDIR}@libdir@/pkgconfig ++ @INSTALL@ -m 644 modglue.pc ${DESTDIR}@libdir@/pkgconfig/ + @INSTALL@ -d -m 755 ${DESTDIR}@prefix@/share/man/man1 + @INSTALL@ man/man1/prompt.1 ${DESTDIR}@prefix@/share/man/man1 + @INSTALL@ man/man1/ptywrap.1 ${DESTDIR}@prefix@/share/man/man1 +--- src/Makefile.in.orig 2013-02-24 11:18:44.000000000 +1300 ++++ src/Makefile.in 2013-09-20 10:07:56.956164930 +1200 +@@ -1,6 +1,8 @@ + + + MACTEST= @MAC_OS_X@ ++prefix = @prefix@ ++exec_prefix = @exec_prefix@ + + ifeq ($(strip $(MACTEST)),) + LIBTOOL = libtool +@@ -21,11 +23,11 @@ + LTRELEASE = `echo ${RELEASE} | sed -e "s/\./:/g"` + + CPHASE = ${LIBTOOL} --tag=CXX --mode=compile @CXX@ -c @CFLAGS@ +-LPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ -version-info ${LTRELEASE} -rpath @prefix@@libdir@ @LIBS@ ++LPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ -version-info ${LTRELEASE} -rpath @libdir@ @LIBS@ + #LPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ -version-info ${LTRELEASE} @LIBS@ + MPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ + IPHASE = ${LIBTOOL} --mode=install @INSTALL@ +-FPHASE = ${LIBTOOL} --mode=finish @prefix@/@libdir@ ++FPHASE = ${LIBTOOL} --mode=finish ${DESTDIR}@libdir@ + + TIMESTAMP = -D"DATETIME=\"`date | sed -e 's/ / /'`\"" -DHOSTNAME=\"`hostname`\" + +@@ -56,21 +58,21 @@ + + #------- Tests ---------------------------------------- + +-test_child_process: test_child_process.o ++test_child_process: library test_child_process.o + ${MPHASE} -o test_child_process $< libmodglue.la + +-test_ext_process: test_ext_process.o ++test_ext_process: library test_ext_process.o + ${MPHASE} -o test_ext_process $< libmodglue.la + +-test_pipe: test_pipe.o ++test_pipe: library test_pipe.o + ${MPHASE} -o test_pipe $< libmodglue.la + +-test_writes: test_writes.o ++test_writes: library test_writes.o + ${MPHASE} -o test_writes $< libmodglue.la + + #------- Tools ---------------------------------------- + +-prompt: prompt.o ++prompt: library prompt.o + ${MPHASE} -o prompt prompt.o `pkg-config sigc++-2.0 --libs` libmodglue.la + # chrpath -d .libs/prompt + +@@ -85,10 +87,10 @@ + endif + + +-ptywrap: ptywrap.o ++ptywrap: library ptywrap.o + ${MPHASE} -o ptywrap ptywrap.o @LINK_UTIL@ + +-ptywrap_static: ptywrap.o ++ptywrap_static: library ptywrap.o + ${CPHASE} ${TIMESTAMP} -o ptywrap.o \ + -I@top_srcdir@/include -DSTATICBUILD ptywrap.cc + ifeq ($(strip $(MACTEST)),) +@@ -109,13 +111,13 @@ + DEVDESTDIR=${DESTDIR} + endif + @INSTALL@ -m 755 -d ${DESTDIR}@prefix@ +- @INSTALL@ -m 755 -d ${DESTDIR}@prefix@/@libdir@ +- @INSTALL@ -m 755 -d ${DEVDESTDIR}@prefix@/@libdir@ ++ @INSTALL@ -m 755 -d ${DESTDIR}@libdir@ ++ @INSTALL@ -m 755 -d ${DEVDESTDIR}@libdir@ + @INSTALL@ -m 755 -d ${DESTDIR}@prefix@/bin + @INSTALL@ -m 755 -d ${DEVDESTDIR}@prefix@/include/modglue +- ${IPHASE} libmodglue.la ${DESTDIR}@prefix@/@libdir@ ++ ${IPHASE} libmodglue.la ${DESTDIR}@libdir@ + ifneq ($(DESTDIR),$(DEVDESTDIR)) +- mv ${DESTDIR}@prefix@/@libdir@/libmodglue*.so ${DEVDESTDIR}@prefix@/@libdir@ ++ mv ${DESTDIR}@libdir@/libmodglue*.so ${DEVDESTDIR}@libdir@ + endif + # ${IPHASE} libmid.la ${DESTDIR}@prefix@/lib + ${FPHASE} diff --git a/sci-libs/modglue/files/modglue-1.19-ldflags.patch b/sci-libs/modglue/files/modglue-1.19-ldflags.patch deleted file mode 100644 index a564d4f..0000000 --- a/sci-libs/modglue/files/modglue-1.19-ldflags.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/Makefile.in.orig 2013-09-04 14:20:05.437329795 +1200 -+++ src/Makefile.in 2013-09-04 14:25:11.533806416 +1200 -@@ -21,9 +21,9 @@ - LTRELEASE = `echo ${RELEASE} | sed -e "s/\./:/g"` - - CPHASE = ${LIBTOOL} --tag=CXX --mode=compile @CXX@ -c @CFLAGS@ --LPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ -version-info ${LTRELEASE} -rpath @prefix@@libdir@ @LIBS@ -+LPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ -version-info ${LTRELEASE} @LDFLAGS@ -rpath @libdir@ @LIBS@ - #LPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ -version-info ${LTRELEASE} @LIBS@ --MPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ -+MPHASE = ${LIBTOOL} --tag=CXX --mode=link @CXX@ @LDFLAGS@ - IPHASE = ${LIBTOOL} --mode=install @INSTALL@ - FPHASE = ${LIBTOOL} --mode=finish @prefix@/@libdir@ - diff --git a/sci-libs/modglue/files/modglue-1.19-parallelmake.patch b/sci-libs/modglue/files/modglue-1.19-parallelmake.patch deleted file mode 100644 index b3dc35e..0000000 --- a/sci-libs/modglue/files/modglue-1.19-parallelmake.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- Makefile.in.orig 2013-09-04 14:12:33.436620240 +1200 -+++ Makefile.in 2013-09-04 14:13:31.051711085 +1200 -@@ -8,7 +8,7 @@ - - library: - echo @libdir@ -- ( cd src && $(MAKE) ); -+ ( cd src && $(MAKE) library tools ); - - static: - ( cd src && $(MAKE) static ); ---- src/Makefile.in.orig 2013-09-04 14:13:46.820735926 +1200 -+++ src/Makefile.in 2013-09-04 14:15:46.020923434 +1200 -@@ -56,21 +56,21 @@ - - #------- Tests ---------------------------------------- - --test_child_process: test_child_process.o -+test_child_process: library test_child_process.o - ${MPHASE} -o test_child_process $< libmodglue.la - --test_ext_process: test_ext_process.o -+test_ext_process: library test_ext_process.o - ${MPHASE} -o test_ext_process $< libmodglue.la - --test_pipe: test_pipe.o -+test_pipe: library test_pipe.o - ${MPHASE} -o test_pipe $< libmodglue.la - --test_writes: test_writes.o -+test_writes: library test_writes.o - ${MPHASE} -o test_writes $< libmodglue.la - - #------- Tools ---------------------------------------- - --prompt: prompt.o -+prompt: library prompt.o - ${MPHASE} -o prompt prompt.o `pkg-config sigc++-2.0 --libs` libmodglue.la - # chrpath -d .libs/prompt - -@@ -85,10 +85,10 @@ - endif - - --ptywrap: ptywrap.o -+ptywrap: library ptywrap.o - ${MPHASE} -o ptywrap ptywrap.o @LINK_UTIL@ - --ptywrap_static: ptywrap.o -+ptywrap_static: library ptywrap.o - ${CPHASE} ${TIMESTAMP} -o ptywrap.o \ - -I@top_srcdir@/include -DSTATICBUILD ptywrap.cc - ifeq ($(strip $(MACTEST)),) diff --git a/sci-libs/modglue/modglue-1.19.ebuild b/sci-libs/modglue/modglue-1.19.ebuild index ca84311..022049c 100644 --- a/sci-libs/modglue/modglue-1.19.ebuild +++ b/sci-libs/modglue/modglue-1.19.ebuild @@ -24,13 +24,8 @@ DEPEND="${RDEPEND} AUTOTOOLS_IN_SOURCE_BUILD=1 PATCHES=( - # Respect LDFLAGS (and a last bit of 64bit problem) - "${FILESDIR}"/${PN}-1.19-ldflags.patch - # fix parallel make. test are made at the same time as the library?? - "${FILESDIR}"/${PN}-1.19-parallelmake.patch - # take care of the lib/lib64 problem. Without this modglue installs - # stuff in /usr/usr/lib64 on 64bits systems. - "${FILESDIR}"/${PN}-1.16-lib64.patch + # consolidated (src/)Makefile.in patch + "${FILESDIR}"/${PN}-1.19-Makefiles.patch ) src_install() {