IcedTea PPC stuff, part 2 of 2

Gary Benson gbenson at redhat.com
Fri Nov 9 03:27:29 PST 2007


...the attached Makefile patch...

Gary Benson wrote:
> Hi all,
> 
> In order to build IcedTea on PPC there are a load of extra files that
> need dropping into the build tree.  The way I propose doing this is
> to have a new directory, "ports", the contents of which are linked
> into the build trees via the rules in the attached Makefile patch.
> Obviously there will only be PPC stuff in there for now, but I kept
> the rules generic so you can drop other ports in there without needing
> to edit anything.
> 
> Ok to commit?
> 
> Cheers,
> Gary
-------------- next part --------------
diff -r 3b5d33558c92 Makefile.am
--- a/Makefile.am	Fri Nov 09 05:55:15 2007 -0500
+++ b/Makefile.am	Fri Nov 09 06:17:42 2007 -0500
@@ -149,6 +149,18 @@ clean-extract:
 clean-extract:
 	rm -f stamps/extract.stamp
 	rm -rf openjdk
+
+# Link ports sources into tree
+stamps/ports.stamp: stamps/extract.stamp
+	for target in ports/hotspot/build/*/platform_* \
+		      ports/hotspot/build/*/makefiles/* \
+		      ports/hotspot/src/*/* \
+		      ports/j2se/src/*/bin/*; do \
+	  link=$$(dirname $$target | sed 's/^ports/openjdk/'); \
+	  ln -sf $$PWD/$$target $$link; \
+	done
+	mkdir -p stamps
+	touch stamps/ports.stamp
 
 # Patch OpenJDK sources for plug replacements.
 if FAST_BUILD
@@ -241,6 +253,18 @@ clean-extract-ecj:
 	rm -f stamps/extract-ecj.stamp
 	rm -rf openjdk-ecj
 
+# Link ports sources into tree
+stamps/ports-ecj.stamp: stamps/extract.stamp
+	for target in ports/hotspot/build/*/platform_* \
+		      ports/hotspot/build/*/makefiles/* \
+		      ports/hotspot/src/*/* \
+		      ports/j2se/src/*/bin/*; do \
+	  link=$$(dirname $$target | sed 's/^ports/openjdk-ecj/'); \
+	  ln -sf $$PWD/$$target $$link; \
+	done
+	mkdir -p stamps
+	touch stamps/ports-ecj.stamp
+
 # Patch OpenJDK for plug replacements and ecj.
 ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
 
@@ -372,7 +396,7 @@ endif
 # If you change anything here in the icedtea target, please make sure
 # you change it in the icedtea-debug target as well.
 icedtea: stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
-	stamps/patch.stamp gcjwebplugin.so
+	stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/control/make
@@ -384,7 +408,7 @@ icedtea: stamps/tools.stamp stamps/plugs
 
 icedtea-debug: 	stamps/bootstrap-directory-symlink.stamp \
 	stamps/tools.stamp stamps/plugs.stamp stamps/extract.stamp \
-	stamps/patch.stamp gcjwebplugin.so
+	stamps/ports.stamp stamps/patch.stamp gcjwebplugin.so
 	$(MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk/control/make \
@@ -409,7 +433,7 @@ icedtea-against-icedtea: \
 # ===================
 
 stamps/icedtea-ecj.stamp: stamps/tools.stamp stamps/plugs.stamp \
-	stamps/extract-ecj.stamp stamps/patch-ecj.stamp
+	stamps/extract-ecj.stamp stamps/ports-ecj.stamp stamps/patch-ecj.stamp
 	$(MAKE) \
 	  $(ICEDTEA_ENV_ECJ) \
 	  -C openjdk-ecj/control/make


More information about the distro-pkg-dev mailing list