[+dam directly] 2015-03-21 20:05 GMT+00:00 Riccardo Mottola <rmott...@opencsw.org>:
> Hi Dago, > > did you with this patch finalize the removal of the special relocation of > libffi.so ? > I had a much easier patch but in case I throw it away for yours. > > Did you build & installed also the packages? I didn't see the emal for > that. > > Riccardo > > > > dmichel...@users.sourceforge.net wrote: > >> Revision: 24742 >> http://sourceforge.net/p/gar/code/24742 >> Author: dmichelsen >> Date: 2015-03-21 19:34:49 +0000 (Sat, 21 Mar 2015) >> Log Message: >> ----------- >> libffi/trunk: Get rid of include relocation >> >> Modified Paths: >> -------------- >> csw/mgar/pkg/libffi/trunk/Makefile >> >> Removed Paths: >> ------------- >> csw/mgar/pkg/libffi/trunk/files/0005-libffi.pc-should- >> point-at-opt-csw-include.patch >> csw/mgar/pkg/libffi/trunk/files/0006-Set-libdir-to-opt- >> csw-lib-ffi.patch >> >> Modified: csw/mgar/pkg/libffi/trunk/Makefile >> =================================================================== >> --- csw/mgar/pkg/libffi/trunk/Makefile 2015-03-21 16:22:22 UTC (rev >> 24741) >> +++ csw/mgar/pkg/libffi/trunk/Makefile 2015-03-21 19:34:49 UTC (rev >> 24742) >> @@ -39,21 +39,17 @@ >> # found at http://software.intel.com/en-us/forums/showthread.php?t= >> 56652 >> # originally for icc, but at least get the stuff to compile >> # PATCHFILES += ffi64.c.patch >> -#PATCHFILES += 0005-libffi.pc-should-point-at-opt-csw-include.patch >> -#PATCHFILES += 0006-Set-libdir-to-opt-csw-lib-ffi.patch >> - >> PACKAGES += CSWlibffi6 >> -PKGFILES_CSWlibffi6 += $(call baseisadirs,$(libdir),libffi\. >> so\.6(\.\d+)*) >> SPKG_DESC_CSWlibffi6 += $(DESCRIPTION), libffi.so.6 >> - >> +PKGFILES_CSWlibffi6 += $(call pkgfiles_lib,libffi.so.6) >> RUNTIME_DEP_PKGS_CSWlibffi6 += CSWlibgcc-s1 >> PACKAGES += CSWlibffi-dev >> SPKG_DESC_CSWlibffi-dev = $(DESCRIPTION) - developer package >> +# PKGFILES is catchall >> RUNTIME_DEP_PKGS_CSWlibffi-dev += CSWlibffi6 >> - >> LICENSE = LICENSE >> BUILD64 = 1 >> @@ -66,8 +62,7 @@ >> CONFIGURE_ENV_PATH = $(PATH):/opt/csw/gnu >> # disabled because they need DejaGNU >> -#TEST_TARGET = check >> -TEST_TARGET = >> +SKIPTEST ?= 1 >> include gar/category.mk >> @@ -84,14 +79,3 @@ >> aclocal; \ >> automake) >> $(MAKECOOKIE) >> - >> -post-install-modulated: >> - ginstall -m 755 -d $(DESTDIR)$(libdir) >> - ginstall -d -m 755 $(DESTDIR)$(includedir) >> - # By default, libffi installer puts include files into a >> subdirectory under >> - # /opt/csw/lib, which makes the header files hard to find. We're >> moving >> - # them to /opt/csw/include. >> - gmv -v $(DESTDIR)$(libdir)/$(NAME)-$(VERSION)/include/* >> $(DESTDIR)$(includedir) >> - rmdir $(DESTDIR)$(libdir)/$(NAME)-$(VERSION)/include >> - rmdir $(DESTDIR)$(libdir)/$(NAME)-$(VERSION) >> - @$(MAKECOOKIE) >> >> Deleted: csw/mgar/pkg/libffi/trunk/files/0005-libffi.pc-should- >> point-at-opt-csw-include.patch >> =================================================================== >> --- >> csw/mgar/pkg/libffi/trunk/files/0005-libffi.pc-should-point-at-opt-csw-include.patch >> 2015-03-21 16:22:22 UTC (rev 24741) >> +++ >> csw/mgar/pkg/libffi/trunk/files/0005-libffi.pc-should-point-at-opt-csw-include.patch >> 2015-03-21 19:34:49 UTC (rev 24742) >> @@ -1,25 +0,0 @@ >> -From f67593e5e96dfc0becb3dc3a2272f4b3cabc4e13 Mon Sep 17 00:00:00 2001 >> -From: Maciej Blizinski <mac...@opencsw.org> >> -Date: Mon, 14 Mar 2011 08:07:09 +0100 >> -Subject: [PATCH] libffi.pc should point at /opt/csw/include >> - >> ---- >> - libffi.pc.in | 2 +- >> - 1 files changed, 1 insertions(+), 1 deletions(-) >> - >> -diff --git a/libffi.pc.in b/libffi.pc.in >> -index c2e1c7b..5f0e9db 100644 >> ---- a/libffi.pc.in >> -+++ b/libffi.pc.in >> -@@ -1,7 +1,7 @@ >> - prefix=@prefix@ >> - exec_prefix=@exec_prefix@ >> - libdir=@libdir@ >> --includedir=${libdir}/@PACKAGE_NAME@-@PACKAGE_VERSION@/include >> -+includedir=${prefix}/include >> - >> - Name: @PACKAGE_NAME@ >> - Description: Library supporting Foreign Function Interfaces >> --- >> -1.7.3.2 >> - >> >> Deleted: csw/mgar/pkg/libffi/trunk/files/0006-Set-libdir-to-opt- >> csw-lib-ffi.patch >> =================================================================== >> --- csw/mgar/pkg/libffi/trunk/files/0006-Set-libdir-to-opt-csw-lib-ffi.patch >> 2015-03-21 16:22:22 UTC (rev 24741) >> +++ csw/mgar/pkg/libffi/trunk/files/0006-Set-libdir-to-opt-csw-lib-ffi.patch >> 2015-03-21 19:34:49 UTC (rev 24742) >> @@ -1,23 +0,0 @@ >> -From 003977c00c9523f4a3a913b40b1460eb718b5d0e Mon Sep 17 00:00:00 2001 >> -From: Maciej Blizinski <mac...@opencsw.org> >> -Date: Sat, 25 Jun 2011 19:18:48 +0200 >> -Subject: [PATCH] Set libdir to /opt/csw/lib/ffi. >> - >> ---- >> - libffi.pc.in | 2 +- >> - 1 files changed, 1 insertions(+), 1 deletions(-) >> - >> -diff --git a/libffi.pc.in b/libffi.pc.in >> -index 692296d..88391dc 100644 >> ---- a/libffi.pc.in >> -+++ b/libffi.pc.in >> -@@ -6,5 +6,5 @@ includedir=${prefix}/include >> - Name: @PACKAGE_NAME@ >> - Description: Library supporting Foreign Function Interfaces >> - Version: @PACKAGE_VERSION@ >> --Libs: -L${libdir} -lffi >> -+Libs: -L${libdir}/ffi -lffi >> - Cflags: -I${includedir} >> --- >> -1.7.5.4 >> - >> >> This was sent by the SourceForge.net collaborative development platform, >> the world's largest Open Source development site. >> >> >
