Annotation of /trunk/java6-openjdk/patches/java6-openjdk-6.1.10.4-hardcoded-test-cmds.patch
Parent Directory | Revision Log
Revision 1657 -
(hide annotations)
(download)
Sat Feb 18 21:54:08 2012 UTC (12 years, 7 months ago) by niro
File size: 1596 byte(s)
Sat Feb 18 21:54:08 2012 UTC (12 years, 7 months ago) by niro
File size: 1596 byte(s)
-pkg move openjdk -> java6-openjdk
1 | niro | 1603 | diff -Naur openjdk/hotspot/make/linux/makefiles/sa.make openjdk-magellan/hotspot/make/linux/makefiles/sa.make |
2 | --- openjdk/hotspot/make/linux/makefiles/sa.make 2011-02-28 17:03:13.000000000 +0100 | ||
3 | +++ openjdk-magellan/hotspot/make/linux/makefiles/sa.make 2012-01-05 19:37:48.692981560 +0100 | ||
4 | @@ -45,8 +45,8 @@ | ||
5 | |||
6 | # gnumake 3.78.1 does not accept the *s that | ||
7 | # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them | ||
8 | -AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1)) | ||
9 | -AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2)) | ||
10 | +AGENT_FILES1 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1)) | ||
11 | +AGENT_FILES2 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2)) | ||
12 | |||
13 | SA_CLASSDIR = $(GENERATED)/saclasses | ||
14 | |||
15 | diff -Naur openjdk/hotspot/make/solaris/makefiles/sa.make openjdk-magellan/hotspot/make/solaris/makefiles/sa.make | ||
16 | --- openjdk/hotspot/make/solaris/makefiles/sa.make 2011-02-28 17:03:13.000000000 +0100 | ||
17 | +++ openjdk-magellan/hotspot/make/solaris/makefiles/sa.make 2012-01-05 19:38:14.591981559 +0100 | ||
18 | @@ -41,8 +41,8 @@ | ||
19 | |||
20 | # gnumake 3.78.1 does not accept the *s that | ||
21 | # are in AGENT_FILES1 and AGENT_FILES2, so use the shell to expand them | ||
22 | -AGENT_FILES1 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1)) | ||
23 | -AGENT_FILES2 := $(shell /usr/bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2)) | ||
24 | +AGENT_FILES1 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES1)) | ||
25 | +AGENT_FILES2 := $(shell /bin/test -d $(AGENT_DIR) && /bin/ls $(AGENT_FILES2)) | ||
26 | |||
27 | SA_CLASSDIR = $(GENERATED)/saclasses | ||
28 |