OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Jun-2007 12:11:18
Branch: HEAD Handle: 2007060611111700
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec
Log:
under MacOS X do not add -Wl,-search_paths_first if -c or -E is
present on the cc command line
Summary:
Revision Changes Path
1.458 +1 -0 openpkg-src/openpkg/HISTORY
1.593 +9 -3 openpkg-src/openpkg/openpkg.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.457 -r1.458 HISTORY
--- openpkg-src/openpkg/HISTORY 5 Jun 2007 19:54:00 -0000 1.457
+++ openpkg-src/openpkg/HISTORY 6 Jun 2007 10:11:17 -0000 1.458
@@ -2,6 +2,7 @@
2007
====
+20070606 under MacOS X do not add -Wl,-search_paths_first if -c or -E is
present on the cc command line
20070605 upgrade to GNU gzip 1.3.12
20070605 upgrade to latest GNU shtool snapshot for final Mac OS X
identification and some small improvements for CentOS
20070604 improve Mac OS X support by providing gcc/cc/ld override scripts to
pass option "-search_paths_first" to ld(1)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.592 -r1.593 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 5 Jun 2007 19:54:00 -0000 1.592
+++ openpkg-src/openpkg/openpkg.spec 6 Jun 2007 10:11:17 -0000 1.593
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20070605
+%define V_openpkg 20070606
# the used software versions
%define V_rpm 4.2.1
@@ -2448,13 +2448,19 @@
ld="`%{l_prefix}/lib/openpkg/shtool path ld`"
if [ ".$gcc" != . -a ! -f %{l_prefix}/lib/openpkg/override/gcc
]; then
( echo "#!/bin/sh"
- echo "exec $gcc -Wl,-search_paths_first \"[EMAIL
PROTECTED]""
+ echo "case \" \$* \" in"
+ echo " *\" -c \"* | *\" -E \"* ) exec $gcc \"[EMAIL
PROTECTED]" ;;"
+ echo " * ) exec $gcc -Wl,-search_paths_first \"[EMAIL
PROTECTED]" ;;"
+ echo "esac"
) >%{l_prefix}/lib/openpkg/override/gcc
chmod 775 %{l_prefix}/lib/openpkg/override/gcc
fi
if [ ".$cc" != . -a ! -f %{l_prefix}/lib/openpkg/override/cc ];
then
( echo "#!/bin/sh"
- echo "exec $cc -Wl,-search_paths_first \"[EMAIL
PROTECTED]""
+ echo "case \" \$* \" in"
+ echo " *\" -c \"* | *\" -E \"* ) exec $gcc \"[EMAIL
PROTECTED]" ;;"
+ echo " * ) exec $cc -Wl,-search_paths_first \"[EMAIL
PROTECTED]" ;;"
+ echo "esac"
) >%{l_prefix}/lib/openpkg/override/cc
chmod 775 %{l_prefix}/lib/openpkg/override/cc
fi
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
