[csw-devel] SF.net SVN: gar:[21539] csw/mgar/pkg/evince/trunk

[cgrzemba at users.sourceforge.net]

Revision: 21539
          http://gar.svn.sourceforge.net/gar/?rev=21539&view=rev
Author:   cgrzemba
Date:     2013-07-23 09:20:33 +0000 (Tue, 23 Jul 2013)
Log Message:
-----------
evince/trunk: fix ltmain.sh for norunpath

Modified Paths:
--------------
    csw/mgar/pkg/evince/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/evince/trunk/files/0001-add-norunpath-to-allowed-compiler-flags-ltmain.sh.patch

Modified: csw/mgar/pkg/evince/trunk/Makefile
===================================================================
--- csw/mgar/pkg/evince/trunk/Makefile	2013-07-22 14:44:11 UTC (rev 21538)
+++ csw/mgar/pkg/evince/trunk/Makefile	2013-07-23 09:20:33 UTC (rev 21539)
@@ -23,6 +23,7 @@
 
 PATCHFILES += 0001-honor-aclocal_flags.patch
 PATCHFILES += 0002-poppler-api-changed.patch
+PATCHFILES += 0001-add-norunpath-to-allowed-compiler-flags-ltmain.sh.patch
 
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
@@ -38,11 +39,11 @@
 # EXTRA_CFLAGS_DBG = -g
 # EXTRA_CFLAGS += $(EXTRA_CFLAGS_$(GARFLAVOR))
 # EXTRA_CXXFLAGS += -DPOPPLER_WITH_GDK
-EXTRA_CXXFLAGS += -DHAVE_POPPLER_PAGE_RENDER -DPOPPLER_HAS_CAIRO
-EXTRA_CFLAGS += -I/opt/csw/include/nautilus -I/opt/csw/include/gnome-vfs-2.0
+EXTRA_CXXFLAGS += -DHAVE_POPPLER_PAGE_RENDER -DPOPPLER_HAS_CAIRO -norunpath
+EXTRA_CFLAGS += -I/opt/csw/include/nautilus -I/opt/csw/include/gnome-vfs-2.0 -xnorunpath
 
 EXTRA_LD_OPTIONS = -lm
-EXTRA_LINKER_FLAGS = -norunpath -xnorunpath
+# EXTRA_LINKER_FLAGS = -norunpath -xnorunpath
 # EXTRA_LD_OPTIONS = /opt/csw/X11/lib/libX11.so -lm
 # There are no shared-object dependencies on CSWdbus, but it's required for
 # evince to work.

Added: csw/mgar/pkg/evince/trunk/files/0001-add-norunpath-to-allowed-compiler-flags-ltmain.sh.patch
===================================================================
--- csw/mgar/pkg/evince/trunk/files/0001-add-norunpath-to-allowed-compiler-flags-ltmain.sh.patch	                        (rev 0)
+++ csw/mgar/pkg/evince/trunk/files/0001-add-norunpath-to-allowed-compiler-flags-ltmain.sh.patch	2013-07-23 09:20:33 UTC (rev 21539)
@@ -0,0 +1,34 @@
+From 37170963829a6dcbf6f303113671168a3984a106 Mon Sep 17 00:00:00 2001
+From: Carsten Grzemba <cgrzemba at opencsw.org>
+Date: Tue, 23 Jul 2013 09:43:29 +0200
+Subject: [PATCH] add norunpath to allowed compiler flags ltmain.sh
+
+---
+ ltmain.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ltmain.sh b/ltmain.sh
+index b36c4ad..bc79f69 100755
+--- a/ltmain.sh
++++ b/ltmain.sh
+@@ -4765,7 +4765,7 @@ func_mode_link ()
+       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+       # @file GCC response files
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-norunpath|-xnorunpath)
+         func_quote_for_eval "$arg"
+ 	arg="$func_quote_for_eval_result"
+         func_append compile_command " $arg"
+@@ -5095,7 +5095,7 @@ func_mode_link ()
+ 	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+ 	  fi
+ 	  for searchdir in $searchdirs; do
+-	    for search_ext in .la $std_shrext .so .a; do
++	    for search_ext in  $std_shrext .so .a; do
+ 	      # Search the libtool library
+ 	      lib="$searchdir/lib${name}${search_ext}"
+ 	      if test -f "$lib"; then
+-- 
+1.8.3.1
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.