From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Mon, 22 Jul 2013 18:10:51 +0000 (+0000)
Subject: Fixed a compile issue on 64-bit Linux with Clang - need to use the -pie option
X-Git-Tag: release-1.7.0~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d939104ddcfbc6ad4122d733f07bd47762a919ff;p=thirdparty%2Fcups.git

Fixed a compile issue on 64-bit Linux with Clang - need to use the -pie option
instead of -Wl,-pie now (<rdar://problem/14480938>)


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11170 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/CHANGES.txt b/CHANGES.txt
index 4fccbb0398..933a7109c9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,8 @@ CHANGES.txt - 1.7.0 - 2013-07-22
 
 CHANGES IN CUPS V1.7.0
 
+	- Fixed a compile issue on 64-bit Linux with Clang - need to use the
+	  -pie option instead of -Wl,-pie now (<rdar://problem/14480938>)
 	- The ippfind utility reported the wrong port numbers when compiled
 	  against Avahi (<rdar://problem/14508324>)
 	- httpGetFd, httpGetFile, httpPutFd, and httpPutFile did not
diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
index 2bf1442a3b..9901977537 100644
--- a/config-scripts/cups-compiler.m4
+++ b/config-scripts/cups-compiler.m4
@@ -132,17 +132,10 @@ if test -n "$GCC"; then
 		# Not available to LSB binaries...
 		AC_MSG_CHECKING(if GCC supports -fPIE)
 		OLDCFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS -fPIE"
-		AC_TRY_COMPILE(,,
-			[case "$CC" in
-				*clang)
-					PIEFLAGS="-fPIE -Wl,-pie"
-					;;
-				*)
-					PIEFLAGS="-fPIE -pie"
-					;;
-			esac
-			AC_MSG_RESULT(yes)],
+		CFLAGS="$CFLAGS -fPIE -pie"
+		AC_TRY_COMPILE(,,[
+		        PIEFLAGS="-fPIE -pie"
+		        AC_MSG_RESULT(yes)],
 			AC_MSG_RESULT(no))
 		CFLAGS="$OLDCFLAGS"
 	fi
diff --git a/doc/help/man-cupsaddsmb.html b/doc/help/man-cupsaddsmb.html
index 0bb0ddcd9a..cc4e46e6c9 100644
--- a/doc/help/man-cupsaddsmb.html
+++ b/doc/help/man-cupsaddsmb.html
@@ -162,8 +162,6 @@ Getting the full set of Windows driver files should be easier.
 <h2 class="title"><a name="SEE_ALSO">See Also</a></h2>
 <i>smbd(8)</i>, <i>smb.conf(5)</i>,
 <a href='http://localhost:631/help'>http://localhost:631/help</a>
-<br>
-<a href='http://www.cups.org/windows/'>http://www.cups.org/windows/</a>
 
 <h2 class="title"><a name="COPYRIGHT">Copyright</a></h2>
 Copyright 2007-2013 by Apple Inc.