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 4fccbb03987b46fa3b3e3bde47a7fb7e1a7a42df..933a7109c9311627abda411b67c64cff8c28723a 100644 (file)
--- 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 2bf1442a3bc7a98ba65ab85668eccc758c822b32..9901977537f26f1a79c4e0f303cfb92fa4dea9ac 100644 (file)
--- 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 0bb0ddcd9a8ae2f1a56e0dc61e2fabe621d27b9e..cc4e46e6c945360c4eb301504fe0de460eb7a3cf 100644 (file)
--- 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.