/hg/icedtea7: PR767: Annotation Processing Filer.getResource() a...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jul 29 17:24:07 PDT 2011
changeset 05b8c708dced in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=05b8c708dced
author: Andrew John Hughes <ahughes at redhat.com>
date: Sat Jul 30 01:23:51 2011 +0100
PR767: Annotation Processing Filer.getResource() always throws
FileNotFoundException PR717: All non-bootstrap patches in IcedTea7
should be in the forest or dropped
2011-07-29 Andrew John Hughes <ahughes at redhat.com>
PR717: All non-bootstrap patches in IcedTea7 should
be in the forest or dropped PR767: Annotation Processing
Filer.getResource() always throws FileNotFoundException
* patches/demos.patch: Moved to IcedTea7 forest.
* patches/gcc-suffix.patch: Recreated more generically in the
forest using BUILD_GCC/BUILD_CPP/HOST_GCC/HOST_CPP
to set the names of the appropriate binaries.
* patches/headers.patch: Recreated in forest using FT2_CFLAGS
and FT2_LIBS for passing FreeType cflags and libraries from
pkg-config.
* patches/jpegclasses.patch: Removed; the com.sun.jpeg classes
should not be in 7.
* patches/memory-limits.patch,
* patches/print-lsb-release.patch: Moved to IcedTea7 forest.
* patches/sunsrc.patch: Obsolete, dropped as in IcedTea6.
* patches/text-relocations.patch: Moved to IcedTea7 forest.
* Makefile.am: (JDK_CHANGESET): Updated to bring in
above patches. (JDK_SHA256SUM): Likewise.
(HOTSPOT_CHANGESET): Likewise. (HOTSPOT_SHA256SUM):
Likewise. (LANGTOOLS_CHANGESET): Bring in fix for
PR767. (LANGTOOLS_SHA256SUM): Likewise.
(ICEDTEA_PATCHES): Remove above patches. (ICEDTEA_ENV): Set
FT2_CFLAGS, FT2_LIBS, BUILD_GCC and BUILD_CPP.
* patches/cacao/arch.patch: Recreated against new forest.
* NEWS: Updated.
diffstat:
ChangeLog | 42 ++
Makefile.am | 28 +-
NEWS | 11 +
patches/cacao/arch.patch | 10 +-
patches/demos.patch | 309 -------------------
patches/gcc-suffix.patch | 58 ---
patches/headers.patch | 37 --
patches/jpegclasses.patch | 639 ----------------------------------------
patches/memory-limits.patch | 22 -
patches/print-lsb-release.patch | 48 ---
patches/sunsrc.patch | 58 ---
patches/text-relocations.patch | 60 ---
12 files changed, 68 insertions(+), 1254 deletions(-)
diffs (truncated from 1474 to 500 lines):
diff -r 05dda6fb5ced -r 05b8c708dced ChangeLog
--- a/ChangeLog Fri Jul 29 00:04:28 2011 +0100
+++ b/ChangeLog Sat Jul 30 01:23:51 2011 +0100
@@ -1,3 +1,45 @@
+2011-07-29 Andrew John Hughes <ahughes at redhat.com>
+
+ PR717: All non-bootstrap patches in IcedTea7
+ should be in the forest or dropped
+ PR767: Annotation Processing Filer.getResource()
+ always throws FileNotFoundException
+ * patches/demos.patch:
+ Moved to IcedTea7 forest.
+ * patches/gcc-suffix.patch:
+ Recreated more generically in the forest
+ using BUILD_GCC/BUILD_CPP/HOST_GCC/HOST_CPP
+ to set the names of the appropriate binaries.
+ * patches/headers.patch:
+ Recreated in forest using FT2_CFLAGS and FT2_LIBS
+ for passing FreeType cflags and libraries from
+ pkg-config.
+ * patches/jpegclasses.patch:
+ Removed; the com.sun.jpeg classes should not be
+ in 7.
+ * patches/memory-limits.patch,
+ * patches/print-lsb-release.patch:
+ Moved to IcedTea7 forest.
+ * patches/sunsrc.patch: Obsolete, dropped as
+ in IcedTea6.
+ * patches/text-relocations.patch:
+ Moved to IcedTea7 forest.
+ * Makefile.am:
+ (JDK_CHANGESET): Updated to bring in
+ above patches.
+ (JDK_SHA256SUM): Likewise.
+ (HOTSPOT_CHANGESET): Likewise.
+ (HOTSPOT_SHA256SUM): Likewise.
+ (LANGTOOLS_CHANGESET): Bring in fix
+ for PR767.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (ICEDTEA_PATCHES): Remove above patches.
+ (ICEDTEA_ENV): Set FT2_CFLAGS, FT2_LIBS,
+ BUILD_GCC and BUILD_CPP.
+ * patches/cacao/arch.patch: Recreated
+ against new forest.
+ * NEWS: Updated.
+
2011-07-28 Andrew John Hughes <ahughes at redhat.com>
Bring in new JDK build cleanups and
diff -r 05dda6fb5ced -r 05b8c708dced Makefile.am
--- a/Makefile.am Fri Jul 29 00:04:28 2011 +0100
+++ b/Makefile.am Sat Jul 30 01:23:51 2011 +0100
@@ -3,19 +3,19 @@
OPENJDK_VERSION = b147
CORBA_CHANGESET = 616c760dc288
-HOTSPOT_CHANGESET = d438a5890756
+HOTSPOT_CHANGESET = ee4dd447f5b9
JAXP_CHANGESET = c40983d6ae70
JAXWS_CHANGESET = 83db5e316798
-JDK_CHANGESET = 4783dfaed9f9
-LANGTOOLS_CHANGESET = 0df09c966a29
+JDK_CHANGESET = ccf86bbc61fd
+LANGTOOLS_CHANGESET = fb7fb3071b64
OPENJDK_CHANGESET = 3defd24c2671
CORBA_SHA256SUM = 7589c42e88b4342750bea5afa306cc662cc9c5f7607fad96f70083ce70f4526e
-HOTSPOT_SHA256SUM = efa3512d4c29306a4e16f854bd2416e6917cdb1741efe0826401c7e0ee13645a
+HOTSPOT_SHA256SUM = 6d54c2ce55748e00c6ecb41ea7c0924e3a1db2cbc2a506fdafee645d7efbc705
JAXP_SHA256SUM = 6ab0cab1965edb28e4093b55436abd04fbffe0b0251016043c75246c4ee9dc2d
JAXWS_SHA256SUM = 5567c90ce2857016365b2e346783a3b16ec0e76b80586a0371f601b4fed01f21
-JDK_SHA256SUM = 8eaecc9db0a9a2266f67b661caaa35a8207263975dc0560a9e82ee83819a6d73
-LANGTOOLS_SHA256SUM = 0118daf4d280d0a56f657fac640ac191ec42a7f49cc12a0693bd0fdd04ec684a
+JDK_SHA256SUM = aedc601afad003ae30b9268cd47c229d00636c488ad921ce02883f68f35842e0
+LANGTOOLS_SHA256SUM = 9ddc00ec50fd2f5e331dc2bc10da4e23b69bf644eb92d50b39a2003c18fb5aa1
OPENJDK_SHA256SUM = 4043a75c2c4385dd735f8dbbf2369311ce1b951217c9dbe9bba9609e24eb291e
CACAO_VERSION = d6264eb66506
@@ -246,15 +246,7 @@
# Patch list
ICEDTEA_PATCHES = \
- patches/text-relocations.patch \
- patches/demos.patch \
- patches/headers.patch \
- patches/gcc-suffix.patch \
- patches/memory-limits.patch \
- patches/sunsrc.patch \
patches/libraries.patch \
- patches/print-lsb-release.patch \
- patches/jpegclasses.patch \
patches/debian/uname.patch \
patches/sparc-ptracefix.patch \
patches/sparc-trapsfix.patch \
@@ -459,8 +451,8 @@
LLVM_CFLAGS="$(LLVM_CFLAGS)" \
LLVM_LDFLAGS="$(LLVM_LDFLAGS)" \
LLVM_LIBS="$(LLVM_LIBS)" \
- FREETYPE2_HEADERS="$(FREETYPE2_CFLAGS)" \
- FT2_LIB="$(FREETYPE2_LIBS)" \
+ FT2_CFLAGS="$(FREETYPE2_CFLAGS)" \
+ FT2_LIBS="$(FREETYPE2_LIBS)" \
ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \
HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \
JAVAC="" \
@@ -477,7 +469,9 @@
ALT_DROPS_DIR="$(abs_top_builddir)/drops" \
ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)" \
VERBOSE="$(VERBOSE)" \
- STATIC_CXX="false"
+ STATIC_CXX="false" \
+ BUILD_GCC="$(CC)" \
+ BUILD_CPP="$(CXX)"
if ENABLE_CACAO
ICEDTEA_ENV += \
diff -r 05dda6fb5ced -r 05b8c708dced NEWS
--- a/NEWS Fri Jul 29 00:04:28 2011 +0100
+++ b/NEWS Sat Jul 30 01:23:51 2011 +0100
@@ -11,6 +11,17 @@
New in release 2.0 (2011-XX-XX):
+* Bug fixes
+ - PR767: Annotation Processing Filer.getResource() always throws FileNotFoundException
+ - Allow the compiler used to be overridden by setting BUILD_GCC/BUILD_CPP.
+ - Fixed regression test runtime/7020373.
+* Zero/Shark
+ - PR757, 7066143: 7009309 regression: x86 stubRoutines
+ - PR753, 7066143: 7009923 regression
+ - methodHandles_zero missing.
+ - sharkContext typo in assert
+ - sharedRuntime needs rework after indy reorg
+ - Add missing describe_pd method for Zero.
* JamVM
- JamVM is self-hosting.
- Make classlib init functions consistent + warnings.
diff -r 05dda6fb5ced -r 05b8c708dced patches/cacao/arch.patch
--- a/patches/cacao/arch.patch Fri Jul 29 00:04:28 2011 +0100
+++ b/patches/cacao/arch.patch Sat Jul 30 01:23:51 2011 +0100
@@ -1,6 +1,6 @@
diff -Nru openjdk.orig/jdk/make/common/Defs-linux.gmk openjdk/jdk/make/common/Defs-linux.gmk
---- openjdk.orig/jdk/make/common/Defs-linux.gmk 2011-04-20 04:40:20.000000000 +0100
-+++ openjdk/jdk/make/common/Defs-linux.gmk 2011-04-21 14:43:06.855289132 +0100
+--- openjdk.orig/jdk/make/common/Defs-linux.gmk 2011-06-11 00:38:06.000000000 +0100
++++ openjdk/jdk/make/common/Defs-linux.gmk 2011-07-29 08:43:20.137660933 +0100
@@ -100,9 +100,19 @@
# We need this frame pointer to make it easy to walk the stacks.
# This should be the default on X86, but ia64 and amd64 may not have this
@@ -22,11 +22,11 @@
LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
diff -Nru openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk openjdk/jdk/make/common/shared/Compiler-gcc.gmk
---- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2011-04-21 10:59:53.000000000 +0100
-+++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2011-04-21 14:43:06.855289132 +0100
-@@ -68,6 +68,52 @@
+--- openjdk.orig/jdk/make/common/shared/Compiler-gcc.gmk 2011-07-29 04:12:27.000000000 +0100
++++ openjdk/jdk/make/common/shared/Compiler-gcc.gmk 2011-07-29 08:43:20.137660933 +0100
+@@ -76,6 +76,52 @@
else
- CXX = $(COMPILER_PATH)g++$(GCC_SUFFIX)
+ CXX = $(BUILD_CPP)
endif
+ ifeq ($(ARCH), alpha)
+ # alpha
@@ -79,7 +79,7 @@
SUN_COMP_VER := $(shell $(CC) --verbose 2>&1 )
diff -Nru openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk openjdk/jdk/make/javax/sound/SoundDefs.gmk
--- openjdk.orig/jdk/make/javax/sound/SoundDefs.gmk 2011-04-20 04:40:20.000000000 +0100
-+++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2011-04-21 14:43:06.855289132 +0100
++++ openjdk/jdk/make/javax/sound/SoundDefs.gmk 2011-07-29 08:43:20.137660933 +0100
@@ -58,10 +58,54 @@
ifeq ($(ZERO_BUILD), true)
CPPFLAGS += -DX_ARCH=X_ZERO
@@ -137,7 +137,7 @@
endif # ARCH sparc
diff -Nru openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h
--- openjdk.orig/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2011-04-20 04:40:22.000000000 +0100
-+++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2011-04-21 14:44:25.900576412 +0100
++++ openjdk/jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2011-07-29 08:43:20.141660999 +0100
@@ -41,6 +41,14 @@
#define X_ZERO 6
#define X_ARM 7
diff -r 05dda6fb5ced -r 05b8c708dced patches/demos.patch
--- a/patches/demos.patch Fri Jul 29 00:04:28 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,317 +0,0 @@
---- openjdkb18/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt 2007-08-16 03:33:19.000000000 -0400
-+++ openjdk/jdk/src/share/demo/jvmti/gctest/sample.makefile.txt 2007-08-23 16:12:59.000000000 -0400
-@@ -43,7 +43,7 @@
-
- # Source lists
- LIBNAME=gctest
--SOURCES=gctest.c ../agent_util/agent_util.c
-+SOURCES=gctest.c ../../agent_util/src/agent_util.c
-
- # Solaris Sun C Compiler Version 5.5
- ifeq ($(OSNAME), solaris)
-@@ -89,7 +89,7 @@
- # Object files needed to create library
- OBJECTS=$(SOURCES:%.c=%.o)
- # Library name and options needed to build it
-- LIBRARY=lib$(LIBNAME).so
-+ LIBRARY=../lib/lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
- # Libraries we are dependent on
- LIBRARIES=-lc
-@@ -122,7 +122,7 @@
-
- # Common -I options
- CFLAGS += -I.
--CFLAGS += -I../agent_util
-+CFLAGS += -I../../agent_util/src
- CFLAGS += -I$(JDK)/include -I$(JDK)/include/$(OSNAME)
-
- # Default rule
---- openjdkb18/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt 2007-08-16 03:33:20.000000000 -0400
-+++ openjdk/jdk/src/share/demo/jvmti/heapTracker/sample.makefile.txt 2007-08-24 15:15:40.000000000 -0400
-@@ -41,13 +41,15 @@
- #
- ########################################################################
-
-+JAVA_CRW_DEMO=../../java_crw_demo/src/libjava_crw_demo.so
-+
- # Source lists
- LIBNAME=heapTracker
--SOURCES=heapTracker.c ../agent_util/agent_util.c
-+SOURCES=heapTracker.c ../../agent_util/src/agent_util.c
- JAVA_SOURCES=HeapTracker.java
-
- # Name of jar file that needs to be created
--JARFILE=heapTracker.jar
-+JARFILE=../heapTracker.jar
-
- # Solaris Sun C Compiler Version 5.5
- ifeq ($(OSNAME), solaris)
-@@ -93,10 +95,10 @@
- # Object files needed to create library
- OBJECTS=$(SOURCES:%.c=%.o)
- # Library name and options needed to build it
-- LIBRARY=lib$(LIBNAME).so
-+ LIBRARY=../lib/lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
- # Libraries we are dependent on
-- LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc
-+ LIBRARIES=-L../../java_crw_demo/src/ -ljava_crw_demo -lc
- # Building a shared library
- LINK_SHARED=$(LINK.c) -shared -o $@
- endif
-@@ -128,15 +130,18 @@
-
- # Common -I options
- CFLAGS += -I.
--CFLAGS += -I../agent_util
--CFLAGS += -I../java_crw_demo
-+CFLAGS += -I../../agent_util/src
-+CFLAGS += -I../../java_crw_demo/src
- CFLAGS += -I$(JDK)/include -I$(JDK)/include/$(OSNAME)
-
- # Default rule (build both native library and jar file)
- all: $(LIBRARY) $(JARFILE)
-
-+$(JAVA_CRW_DEMO):
-+ make JDK=$(JDK) OSNAME=$(OSNAME) -C ../../java_crw_demo/src -f sample.makefile.txt
-+
- # Build native library
--$(LIBRARY): $(OBJECTS)
-+$(LIBRARY): $(OBJECTS) $(JAVA_CRW_DEMO)
- $(LINK_SHARED) $(OBJECTS) $(LIBRARIES)
-
- # Build jar file
---- openjdkb18/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt 2007-08-16 03:33:20.000000000 -0400
-+++ openjdk/jdk/src/share/demo/jvmti/heapViewer/sample.makefile.txt 2007-08-23 16:13:00.000000000 -0400
-@@ -43,7 +43,7 @@
-
- # Source lists
- LIBNAME=heapViewer
--SOURCES=heapViewer.c ../agent_util/agent_util.c
-+SOURCES=heapViewer.c ../../agent_util/src/agent_util.c
-
- # Solaris Sun C Compiler Version 5.5
- ifeq ($(OSNAME), solaris)
-@@ -89,7 +89,7 @@
- # Object files needed to create library
- OBJECTS=$(SOURCES:%.c=%.o)
- # Library name and options needed to build it
-- LIBRARY=lib$(LIBNAME).so
-+ LIBRARY=../lib/lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
- # Libraries we are dependent on
- LIBRARIES=-lc
-@@ -123,6 +123,7 @@
- # Common -I options
- CFLAGS += -I.
- CFLAGS += -I$(JDK)/include -I$(JDK)/include/$(OSNAME)
-+CFLAGS += -I../../agent_util/src
-
- # Default rule
- all: $(LIBRARY)
---- openjdkb18/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt 2007-08-16 03:33:21.000000000 -0400
-+++ openjdk/jdk/src/share/demo/jvmti/hprof/sample.makefile.txt 2007-08-23 16:12:58.000000000 -0400
-@@ -73,7 +73,7 @@
- JAVA_SOURCES=Tracker.java
-
- # Name of jar file that needs to be created
--#JARFILE=hprof.jar
-+JARFILE=../hprof.jar
-
- # Solaris Sun C Compiler Version 5.5
- ifeq ($(OSNAME), solaris)
-@@ -110,7 +110,7 @@
- # Linux GNU C Compiler
- ifeq ($(OSNAME), linux)
- # GNU Compiler options needed to build it
-- COMMON_FLAGS=-fno-strict-aliasing -fPIC -fno-omit-frame-pointer
-+ COMMON_FLAGS=-fno-strict-aliasing -fPIC -fno-omit-frame-pointer -DSKIP_NPT
- # Options that help find errors
- COMMON_FLAGS+= -W -Wall -Wno-unused -Wno-parentheses
- # To allow access to dladdr()
-@@ -166,7 +166,7 @@
-
- # Common -I options
- CFLAGS += -I.
--CFLAGS += -I../java_crw_demo
-+CFLAGS += -I../../java_crw_demo/src
- CFLAGS += -I$(JDK)/include -I$(JDK)/include/$(OSNAME)
-
- # Default rule (build both native library and jar file)
---- openjdkb18/jdk/src/share/demo/jvmti/minst/sample.makefile.txt 2007-08-16 03:33:21.000000000 -0400
-+++ openjdk/jdk/src/share/demo/jvmti/minst/sample.makefile.txt 2007-08-24 15:16:17.000000000 -0400
-@@ -41,13 +41,15 @@
- #
- ########################################################################
-
-+JAVA_CRW_DEMO=../../java_crw_demo/src/libjava_crw_demo.so
-+
- # Source lists
- LIBNAME=minst
--SOURCES=minst.c ../agent_util/agent_util.c
-+SOURCES=minst.c ../../agent_util/src/agent_util.c
- JAVA_SOURCES=Minst.java
-
- # Name of jar file that needs to be created
--JARFILE=minst.jar
-+JARFILE=../minst.jar
-
- # Solaris Sun C Compiler Version 5.5
- ifeq ($(OSNAME), solaris)
-@@ -93,10 +95,10 @@
- # Object files needed to create library
- OBJECTS=$(SOURCES:%.c=%.o)
- # Library name and options needed to build it
-- LIBRARY=lib$(LIBNAME).so
-+ LIBRARY=../lib/lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
- # Libraries we are dependent on
-- LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc
-+ LIBRARIES=-L../../java_crw_demo/src/ -ljava_crw_demo -lc
- # Building a shared library
- LINK_SHARED=$(LINK.c) -shared -o $@
- endif
-@@ -128,15 +130,18 @@
-
- # Common -I options
- CFLAGS += -I.
--CFLAGS += -I../agent_util
--CFLAGS += -I../java_crw_demo
-+CFLAGS += -I../../agent_util/src
-+CFLAGS += -I../../java_crw_demo/src
- CFLAGS += -I$(JDK)/include -I$(JDK)/include/$(OSNAME)
-
- # Default rule (build both native library and jar file)
- all: $(LIBRARY) $(JARFILE)
-
-+$(JAVA_CRW_DEMO):
-+ make JDK=$(JDK) OSNAME=$(OSNAME) -C ../../java_crw_demo/src -f sample.makefile.txt
-+
- # Build native library
--$(LIBRARY): $(OBJECTS)
-+$(LIBRARY): $(OBJECTS) $(JAVA_CRW_DEMO)
- $(LINK_SHARED) $(OBJECTS) $(LIBRARIES)
-
- # Build jar file
---- openjdkb18/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt 2007-08-16 03:33:21.000000000 -0400
-+++ openjdk/jdk/src/share/demo/jvmti/mtrace/sample.makefile.txt 2007-08-24 15:16:01.000000000 -0400
-@@ -41,13 +41,15 @@
- #
- ########################################################################
-
-+JAVA_CRW_DEMO=../../java_crw_demo/src/libjava_crw_demo.so
-+
- # Source lists
- LIBNAME=mtrace
--SOURCES=mtrace.c ../agent_util/agent_util.c
-+SOURCES=mtrace.c ../../agent_util/src/agent_util.c
- JAVA_SOURCES=Mtrace.java
-
- # Name of jar file that needs to be created
--JARFILE=mtrace.jar
-+JARFILE=../mtrace.jar
-
- # Solaris Sun C Compiler Version 5.5
- ifeq ($(OSNAME), solaris)
-@@ -93,10 +95,11 @@
- # Object files needed to create library
- OBJECTS=$(SOURCES:%.c=%.o)
- # Library name and options needed to build it
-- LIBRARY=lib$(LIBNAME).so
-+ LIBRARY=../lib/lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
- # Libraries we are dependent on
-- LIBRARIES=-L $(JDK)/jre/lib/$(LIBARCH) -ljava_crw_demo -lc
-+ LIBRARIES=-L../../java_crw_demo/src -ljava_crw_demo -lc
-+
- # Building a shared library
- LINK_SHARED=$(LINK.c) -shared -o $@
- endif
-@@ -128,15 +131,18 @@
-
- # Common -I options
- CFLAGS += -I.
--CFLAGS += -I../agent_util
--CFLAGS += -I../java_crw_demo
-+CFLAGS += -I../../agent_util/src
-+CFLAGS += -I../../java_crw_demo/src
- CFLAGS += -I$(JDK)/include -I$(JDK)/include/$(OSNAME)
-
- # Default rule (build both native library and jar file)
- all: $(LIBRARY) $(JARFILE)
-
-+$(JAVA_CRW_DEMO):
-+ make JDK=$(JDK) OSNAME=$(OSNAME) -C ../../java_crw_demo/src -f sample.makefile.txt
-+
- # Build native library
--$(LIBRARY): $(OBJECTS)
-+$(LIBRARY): $(OBJECTS) $(JAVA_CRW_DEMO)
- $(LINK_SHARED) $(OBJECTS) $(LIBRARIES)
-
- # Build jar file
---- openjdkb18/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt 2007-08-16 03:33:21.000000000 -0400
-+++ openjdk/jdk/src/share/demo/jvmti/versionCheck/sample.makefile.txt 2007-08-23 16:12:58.000000000 -0400
-@@ -43,7 +43,7 @@
-
- # Source lists
- LIBNAME=versionCheck
--SOURCES=versionCheck.c ../agent_util/agent_util.c
-+SOURCES=versionCheck.c ../../agent_util/src/agent_util.c
-
- # Solaris Sun C Compiler Version 5.5
- ifeq ($(OSNAME), solaris)
-@@ -89,7 +89,7 @@
- # Object files needed to create library
- OBJECTS=$(SOURCES:%.c=%.o)
- # Library name and options needed to build it
-- LIBRARY=lib$(LIBNAME).so
-+ LIBRARY=../lib/lib$(LIBNAME).so
- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
- # Libraries we are dependent on
- LIBRARIES=-lc
-@@ -122,7 +122,7 @@
-
- # Common -I options
- CFLAGS += -I.
--CFLAGS += -I../agent_util
-+CFLAGS += -I../../agent_util/src
- CFLAGS += -I$(JDK)/include -I$(JDK)/include/$(OSNAME)
-
- # Default rule
---- openjdkb18/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt 2007-08-16 03:33:21.000000000 -0400
-+++ openjdk/jdk/src/share/demo/jvmti/waiters/sample.makefile.txt 2007-08-23 16:13:06.000000000 -0400
-@@ -43,7 +43,7 @@
-
- # Source lists
- LIBNAME=waiters
--SOURCES=waiters.cpp Agent.cpp Thread.cpp Monitor.cpp ../agent_util/agent_util.c
-+SOURCES=waiters.cpp Agent.cpp Thread.cpp Monitor.cpp
-
- # Solaris Sun C Compiler Version 5.5
- ifeq ($(OSNAME), solaris)
-@@ -89,9 +89,10 @@
- endif
- # Object files needed to create library
- OBJECTS=$(SOURCES:%.cpp=%.o)
-+ OBJECTS+=../../agent_util/src/agent_util.o
- # Library name and options needed to build it
-- LIBRARY=lib$(LIBNAME).so
-- LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc -mimpure-text
-+ LIBRARY=../lib/lib$(LIBNAME).so
-+ LDFLAGS=-Wl,-soname=$(LIBRARY) -static-libgcc
- # Libraries we are dependent on
- LIBRARIES=
- # Building a shared library
-@@ -123,9 +124,10 @@
-
- # Common -I options
- CXXFLAGS += -I.
--CXXFLAGS += -I../agent_util
-+CXXFLAGS += -I../../agent_util/src
- CXXFLAGS += -I$(JDK)/include -I$(JDK)/include/$(OSNAME)
-
More information about the distro-pkg-dev
mailing list