diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-11-11 15:45:58 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-11 16:32:40 +0000 |
| commit | 889b6a6e00994099327b9b874c93add6f88baa0a (patch) | |
| tree | fca4258fc460c589fa9307f601cd6d3c150d3798 /rhino | |
| parent | 98a10b638a645776d14049b8fb12a87b80b6eb3b (diff) | |
Related: rhbz#753201 fedora ant+java-1.5.0-gcj won't resolve env variables
Diffstat (limited to 'rhino')
| -rw-r--r-- | rhino/makefile.mk | 4 | ||||
| -rw-r--r-- | rhino/rhino1_5R5-find_swing.patch | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/rhino/makefile.mk b/rhino/makefile.mk index 91117d9338bd..577d0300c495 100644 --- a/rhino/makefile.mk +++ b/rhino/makefile.mk @@ -58,9 +58,9 @@ FIXED_TARFILE_LOCATION=$(TARFILE_LOCATION) .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= .EXPORT : JAVA_HOME -BUILD_ACTION=$(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj jar +BUILD_ACTION=$(ANT) -DTARFILE_LOCATION="$(FIXED_TARFILE_LOCATION)" -Dbuild.label="build-$(RSCREVISION)" -Dbuild.compiler=gcj jar .ELSE -BUILD_ACTION=TARFILE_LOCATION="$(FIXED_TARFILE_LOCATION)" $(ANT) -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) jar +BUILD_ACTION=$(ANT) -DTARFILE_LOCATION="$(FIXED_TARFILE_LOCATION)" -Dbuild.label="build-$(RSCREVISION)" -Dant.build.javac.source=$(JAVA_SOURCE_VER) -Dant.build.javac.target=$(JAVA_TARGET_VER) jar .ENDIF # --- Targets ------------------------------------------------------ diff --git a/rhino/rhino1_5R5-find_swing.patch b/rhino/rhino1_5R5-find_swing.patch index 220c4f4e668a..f074fa845490 100644 --- a/rhino/rhino1_5R5-find_swing.patch +++ b/rhino/rhino1_5R5-find_swing.patch @@ -1,11 +1,10 @@ --- misc/rhino1_5R5/toolsrc/build.xml 2009-10-29 18:29:46.605524507 +0100 +++ misc/build/rhino1_5R5/toolsrc/build.xml 2009-10-29 18:29:26.536908810 +0100 -@@ -12,6 +12,8 @@ +@@ -12,6 +12,7 @@ <os family="unix"/> </and> </condition> -+ <property environment="solenv"/> -+ <property name="swing_zip" value="${solenv.TARFILE_LOCATION}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"/> ++ <property name="swing_zip" value="${TARFILE_LOCATION}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"/> <path id="macPath" location="${java.home}/../Classes/classes.jar"/> <!-- rhino.jar from OpenJDK breaks build --> <path id="nonMacPath"> |