[98868] trunk/dports/devel/ld64

jeremyhu at macports.org jeremyhu at macports.org
Fri Oct 19 00:57:52 PDT 2012


Revision: 98868
          http://trac.macports.org//changeset/98868
Author:   jeremyhu at macports.org
Date:     2012-10-19 00:57:52 -0700 (Fri, 19 Oct 2012)
Log Message:
-----------
ld64: Avoid a possible race condition creating configure.h on ML (should fix #36026)

Modified Paths:
--------------
    trunk/dports/devel/ld64/Portfile
    trunk/dports/devel/ld64/files/Makefile-127
    trunk/dports/devel/ld64/files/Makefile-133
    trunk/dports/devel/ld64/files/Makefile-97

Modified: trunk/dports/devel/ld64/Portfile
===================================================================
--- trunk/dports/devel/ld64/Portfile	2012-10-19 07:37:59 UTC (rev 98867)
+++ trunk/dports/devel/ld64/Portfile	2012-10-19 07:57:52 UTC (rev 98868)
@@ -8,7 +8,7 @@
 name                    ld64
 # XCode 4.4
 version                 133.3
-revision                3
+revision                4
 set llvm_version        3.0
 categories              devel
 platforms               darwin
@@ -129,13 +129,6 @@
     reinplace "s|@@VERSION@@|${version}|g" \
         ${worksrcpath}/src/ld/Options.cpp
 
-    if {${os.major} >= 11} {
-        reinplace "s|configure.h|ld-configure.h|g" \
-            ${worksrcpath}/Makefile \
-            ${worksrcpath}/src/abstraction/MachOFileAbstraction.hpp \
-            ${worksrcpath}/src/create_configure
-    }
-
     if {${os.major} < 9} {
         # No CommonCrypto, use openssl
         reinplace "s:<CommonCrypto/CommonDigest.h>:<openssl/md5.h>:" \
@@ -145,7 +138,10 @@
     } 
 }
 
-use_configure no
+configure {
+    system "cd ${worksrcpath} && ${build.cmd} src/ld/configure.h"
+}
+
 build.args \
     CC="${configure.cc}" \
     CXX="${configure.cxx}" \

Modified: trunk/dports/devel/ld64/files/Makefile-127
===================================================================
--- trunk/dports/devel/ld64/files/Makefile-127	2012-10-19 07:37:59 UTC (rev 98867)
+++ trunk/dports/devel/ld64/files/Makefile-127	2012-10-19 07:57:52 UTC (rev 98868)
@@ -18,10 +18,8 @@
 PREFIX = /usr
 endif
 
-all : ObjectDump dyldinfo ld machocheck rebase unwinddump libprunetrie.a
+all : src/ld/configure.h ObjectDump dyldinfo ld machocheck rebase unwinddump libprunetrie.a
 
-src/ld/ld.o : src/ld/configure.h
-src/ld/Options.o : src/ld/configure.h
 src/ld/configure.h :
 	touch $@
 

Modified: trunk/dports/devel/ld64/files/Makefile-133
===================================================================
--- trunk/dports/devel/ld64/files/Makefile-133	2012-10-19 07:37:59 UTC (rev 98867)
+++ trunk/dports/devel/ld64/files/Makefile-133	2012-10-19 07:57:52 UTC (rev 98868)
@@ -18,7 +18,7 @@
 PREFIX = /usr
 endif
 
-all : ObjectDump dyldinfo ld machocheck rebase unwinddump libprunetrie.a
+all : src/ld/configure.h ObjectDump dyldinfo ld machocheck rebase unwinddump libprunetrie.a
 
 src/ld/Snapshot.o : src/ld/compile_stubs.h
 src/ld/compile_stubs.h : compile_stubs
@@ -26,9 +26,6 @@
 	cat $^ | sed s/\"/\\\\\"/g | sed s/^/\"/ | sed s/$$/\\\\n\"/ >> $@
 	echo ";" >> $@
 
-src/ld/ld.o : src/ld/configure.h
-src/other/ObjectDump.o : src/ld/configure.h
-src/ld/Options.o : src/ld/configure.h
 src/ld/configure.h : src/create_configure
 	DERIVED_SOURCES_DIR=src/ld DERIVED_FILE_DIR=src/ld $^ > $@
 

Modified: trunk/dports/devel/ld64/files/Makefile-97
===================================================================
--- trunk/dports/devel/ld64/files/Makefile-97	2012-10-19 07:37:59 UTC (rev 98867)
+++ trunk/dports/devel/ld64/files/Makefile-97	2012-10-19 07:57:52 UTC (rev 98868)
@@ -18,10 +18,8 @@
 PREFIX = /usr
 endif
 
-all : ObjectDump dyldinfo ld machocheck rebase unwinddump libprunetrie.a
+all : src/ld/configure.h ObjectDump dyldinfo ld machocheck rebase unwinddump libprunetrie.a
 
-src/ld/ld.o : src/ld/configure.h
-src/ld/Options.o : src/ld/configure.h
 src/ld/configure.h :
 	touch $@
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121019/9f333edf/attachment.html>


More information about the macports-changes mailing list