diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2009-11-25 17:29:52 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Sun.COM> | 2009-11-25 17:29:52 +0100 |
| commit | b17875df16b0a528aa49f0f8d347517d02ecf895 (patch) | |
| tree | a2b5608465607cc6eab7d7f6b9b12cfa49b0ca27 | |
| parent | 2ab67fea8f0bdcd92153cebaffbdbc44b05de47d (diff) | |
| parent | 8180586f8bf8aa7f728b0bc03c98eabd932cd114 (diff) | |
merge with DEV300m65
| -rw-r--r-- | icc/makefile.mk | 2 | ||||
| -rw-r--r-- | redland/redland/makefile.mk | 4 | ||||
| -rwxr-xr-x | rhino/makefile.mk | 3 | ||||
| -rw-r--r-- | rhino/rhino1_5R5-find_swing.patch | 22 |
4 files changed, 27 insertions, 4 deletions
diff --git a/icc/makefile.mk b/icc/makefile.mk index 5542db030ce6..abd8b59165a1 100644 --- a/icc/makefile.mk +++ b/icc/makefile.mk @@ -54,7 +54,7 @@ CONVERTFILES= \ Contrib$/ICC_utils$/Stubs.h \ Contrib$/ICC_utils$/Vetters.cpp -CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine && unzip $(BACK_PATH)..$/makefiles.zip +CONFIGURE_ACTION= $(GNUCOPY) -r $(BACK_PATH)..$/source$/create_sRGB_profile Contrib$/CmdLine && unzip -o $(BACK_PATH)..$/makefiles.zip BUILD_ACTION=dmake && cd Contrib$/CmdLine$/create_sRGB_profile && $(AUGMENT_LIBRARY_PATH) .$/create_sRGB_profile # --- Targets ------------------------------------------------------ diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk index bb9fe2033ad2..927f9868b10d 100644 --- a/redland/redland/makefile.mk +++ b/redland/redland/makefile.mk @@ -107,8 +107,8 @@ CFLAGS=-m64 .ENDIF # NB: SOLARDIR before SYSBASE, because linux SYSBASE contains obsolete libcrypto -CPPFLAGS+:=-I$(SOLARINCDIR)$/external -LDFLAGS+:=-L$(SOLARLIBDIR) +CPPFLAGS+:=-I$(PWD)$/$(INCCOM) -I$(SOLARINCDIR)$/external +LDFLAGS+:=-L$(PWD)$/$(LB) -L$(SOLARLIBDIR) .IF "$(SYSBASE)"!="" CPPFLAGS+:=-I$(SYSBASE)$/usr$/include diff --git a/rhino/makefile.mk b/rhino/makefile.mk index 24517b6dafd7..0809007ea7b4 100755 --- a/rhino/makefile.mk +++ b/rhino/makefile.mk @@ -48,7 +48,8 @@ TARFILE_ROOTDIR=rhino1_5R5 ADDITIONAL_FILES= \ toolsrc/org/mozilla/javascript/tools/debugger/OfficeScriptInfo.java -PATCH_FILES=rhino1_5R5.patch +PATCH_FILES=rhino1_5R5.patch \ + rhino1_5R5-find_swing.patch .IF "$(JAVACISGCJ)"=="yes" JAVA_HOME= diff --git a/rhino/rhino1_5R5-find_swing.patch b/rhino/rhino1_5R5-find_swing.patch new file mode 100644 index 000000000000..e94974a41574 --- /dev/null +++ b/rhino/rhino1_5R5-find_swing.patch @@ -0,0 +1,22 @@ +--- 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,10 @@ + <os family="unix"/> + </and> + </condition> ++ <property environment="solenv"/> ++ <condition property="swing_zip" value="${solenv.TARFILE_LOCATION}/swingExSrc.zip" else="../../../../../download/swingExSrc.zip"> ++ <isset property="solenv.TARFILE_LOCATION" /> ++ </condition> + <path id="macPath" location="${java.home}/../Classes/classes.jar"/> + <!-- rhino.jar from OpenJDK breaks build --> + <path id="nonMacPath"> +@@ -38,7 +42,7 @@ + <!-- Download source from Sun's site, unzip it, remove + the files we don't need, and change the package + --> +- <unzip src="../../../../../download/swingExSrc.zip" dest="${src.debugger}"/> ++ <unzip src="${swing_zip}" dest="${src.debugger}"/> + <delete file="${src.debugger}/FileSystemModel2.java" /> + <delete file="${src.debugger}/MergeSort.java" /> + <delete file="${src.debugger}/TreeTableExample2.java" /> |