rpms/cups/devel cups-rpath.patch, NONE, 1.1 cups.spec, 1.178, 1.179 cups-1.1.19-no_rpath.patch, 1.2, NONE

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/cups/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2047

Modified Files:
	cups.spec 
Added Files:
	cups-rpath.patch 
Removed Files:
	cups-1.1.19-no_rpath.patch 
Log Message:
- Better rpath patch.

cups-rpath.patch:
 cups-sharedlibs.m4 |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

--- NEW FILE cups-rpath.patch ---
--- cups-1.2rc3/config-scripts/cups-sharedlibs.m4.rpath	2006-04-28 14:17:09.000000000 +0100
+++ cups-1.2rc3/config-scripts/cups-sharedlibs.m4	2006-04-28 14:24:52.000000000 +0100
@@ -26,6 +26,7 @@
 DSOFLAGS="${DSOFLAGS:=}"
 
 AC_ARG_ENABLE(shared, [  --enable-shared         turn on shared libraries, default=yes])
+AC_ARG_ENABLE(rpath, [  --enable-rpath          turn on rpath-style link options, default=yes])
 
 if test x$enable_shared != xno; then
 	case "$uname" in
@@ -45,7 +46,11 @@
 			LIBCUPS="libcups.so.2"
 			LIBCUPSIMAGE="libcupsimage.so.2"
 			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-rpath,\$(libdir),-set_version,sgi2.6,-soname,\$@ -shared \$(OPTIM)"
+			RPATH=""
+			if test x$enable_rpath != xno; then
+			  RPATH=",-rpath,\$(libdir)"
+			fi
+			DSOFLAGS="$DSOFLAGS -Wl$RPATH,-set_version,sgi2.6,-soname,\$@ -shared \$(OPTIM)"
 			;;
 		OSF1* | Linux | GNU | *BSD*)
 			LIBCUPS="libcups.so.2"
@@ -63,7 +68,11 @@
 			LIBCUPS="libcups_s.a"
 			LIBCUPSIMAGE="libcupsimage_s.a"
 			DSO="\$(CC)"
-			DSOFLAGS="$DSOFLAGS -Wl,-bexpall,-bM:SRE,-bnoentry,-blibpath:\$(libdir)"
+			RPATH=""
+			if test x$enable_rpath != xno; then
+			  RPATH=",-blibpath:\$(libdir)"
+			fi
+			DSOFLAGS="$DSOFLAGS -Wl,-bexpall,-bM:SRE,-bnoentry$RPATH"
 			;;
 		*)
 			echo "Warning: shared libraries may not be supported.  Trying -shared"
@@ -116,7 +125,7 @@
 	# The *BSD, HP-UX, and Solaris run-time linkers need help when
 	# deciding where to find a DSO.  Add linker options to tell them
 	# where to find the DSO (usually in /usr/lib...  duh!)
-	case $uname in
+	if test x$enable_rpath != xno; then case $uname in
                 HP-UX*)
 			# HP-UX
                 	DSOFLAGS="+s +b $libdir $DSOFLAGS"
@@ -141,7 +150,7 @@
                         LDFLAGS="$LDFLAGS -Wl,-rpath,$libdir"
                         EXPORT_LDFLAGS="-Wl,-rpath,$libdir"
                         ;;
-	esac
+	esac; fi
 else
 	DSOLIBS=""
 	IMGLIBS="\$(LIBPNG) \$(LIBTIFF) \$(LIBJPEG) \$(LIBZ)"


Index: cups.spec
===================================================================
RCS file: /cvs/dist/rpms/cups/devel/cups.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- cups.spec	28 Apr 2006 13:09:58 -0000	1.178
+++ cups.spec	28 Apr 2006 13:32:35 -0000	1.179
@@ -29,7 +29,7 @@
 Patch6: cups-includeifexists.patch
 Patch7: cups-banners.patch
 Patch12: cups-locale.patch
-Patch17: cups-1.1.19-no_rpath.patch
+Patch17: cups-rpath.patch
 Patch18: cups-language.patch
 Patch20: cups-direct-usb.patch
 Patch22: cups-dest-cache-v2.patch
@@ -110,7 +110,7 @@
 %patch6 -p1 -b .includeifexists
 %patch7 -p1 -b .banners
 %patch12 -p1 -b .locale
-%patch17 -p1 -b .no_rpath
+%patch17 -p1 -b .rpath
 %patch18 -p1 -b .language
 %patch20 -p1 -b .direct-usb
 %patch22 -p1 -b .dest-cache-v2
@@ -131,7 +131,7 @@
 export CFLAGS="-DLDAP_DEPRECATED=1"
 %configure --with-docdir=%{_docdir}/cups-%{version} \
 	--with-optim="$RPM_OPT_FLAGS $CFLAGS -fstack-protector-all" \
-	--with-log-file-perm=0700 --enable-pie
+	--with-log-file-perm=0700 --enable-pie --disable-rpath
 
 # If we got this far, all prerequisite libraries must be here.
 make
@@ -376,6 +376,7 @@
 - No longer need link, CAN-2005-0064, or no-propagate-ipp-port patches.
 - Switch to upstream PIE implementation (every single binary is PIE).
 - Extend relro to all binaries.
+- Better rpath patch.
 
 * Wed Apr 26 2006 Tim Waugh <twaugh at redhat.com>
 - No longer need backend, rcp, or ppdsdat patches.


--- cups-1.1.19-no_rpath.patch DELETED ---