FYI: [icedtea6] Remove shared object files
Andrew John Hughes
gnu_andrew at member.fsf.org
Wed Jun 25 17:03:02 PDT 2008
This patch drops the creation of libdcpr.so and libjsoundhs.so.
These were designed to fake the binary plugs, but are no longer
needed with the latest OpenJDK6.
ChangeLog:
2008-06-26 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am: Don't bother with the
shared object files. We don't need
them any more.
* Makefile.in: Regenerated.
--
Andrew :)
Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA 7927 142C 2591 94EF D9D8
-------------- next part --------------
diff -r 59259282a3ae Makefile.am
--- a/Makefile.am Wed Jun 25 22:46:25 2008 +0100
+++ b/Makefile.am Thu Jun 26 01:00:44 2008 +0100
@@ -725,8 +725,7 @@ stamps/icedtea-against-ecj.stamp: \
# Binary Plugs and Tools Targets
# ==============================
-stamps/plugs.stamp: $(SHARED_OBJECT_FILES) \
- bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
+stamps/plugs.stamp: bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
mkdir -p stamps
touch stamps/plugs.stamp
@@ -743,23 +742,6 @@ clean-tools-jar: clean-hotspot-tools
rm -f stamps/hotspot-tools.stamp
rm -rf tools/
rm -f bootstrap/jdk1.7.0/jre/lib/tools.jar
-
-# Shared objects.
-SHARED_OBJECT_FILES = \
- bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libdcpr.so \
- bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libjsoundhs.so
-
-$(SHARED_OBJECT_FILES):
- mkdir -p bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)
- for shared_object in $(SHARED_OBJECT_FILES) ; \
- do \
- echo | $(CC) $(CFLAGS) -fpic -shared \
- -o $$shared_object \
- -Wl,-soname,$$shared_object -xc - ; \
- done
-
-clean-shared-objects:
- rm -f $(SHARED_OBJECT_FILES)
# Sources copied from OpenJDK.
ICEDTEA_COPY_DIRS = \
diff -r 59259282a3ae Makefile.in
--- a/Makefile.in Wed Jun 25 22:46:25 2008 +0100
+++ b/Makefile.in Thu Jun 26 01:00:45 2008 +0100
@@ -476,12 +476,6 @@ ICEDTEA_ECJ_PATCH = $(srcdir)/patches/ic
@WITH_CACAO_TRUE at ICEDTEA_BUILD_TARGET = j2se_only
@WITH_CACAO_FALSE at ICEDTEA_DEBUG_BUILD_TARGET = debug_build
@WITH_CACAO_TRUE at ICEDTEA_DEBUG_BUILD_TARGET = j2se_fastdebug_only
-
-# Shared objects.
-SHARED_OBJECT_FILES = \
- bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libdcpr.so \
- bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)/libjsoundhs.so
-
# Sources copied from OpenJDK.
ICEDTEA_COPY_DIRS = \
@@ -1190,8 +1184,7 @@ stamps/icedtea-against-ecj.stamp: \
# Binary Plugs and Tools Targets
# ==============================
-stamps/plugs.stamp: $(SHARED_OBJECT_FILES) \
- bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
+stamps/plugs.stamp: bootstrap/jdk1.7.0/jre/lib/rt-closed.jar
mkdir -p stamps
touch stamps/plugs.stamp
@@ -1208,18 +1201,6 @@ clean-tools-jar: clean-hotspot-tools
rm -f stamps/hotspot-tools.stamp
rm -rf tools/
rm -f bootstrap/jdk1.7.0/jre/lib/tools.jar
-
-$(SHARED_OBJECT_FILES):
- mkdir -p bootstrap/jdk1.7.0/jre/lib/$(INSTALL_ARCH_DIR)
- for shared_object in $(SHARED_OBJECT_FILES) ; \
- do \
- echo | $(CC) $(CFLAGS) -fpic -shared \
- -o $$shared_object \
- -Wl,-soname,$$shared_object -xc - ; \
- done
-
-clean-shared-objects:
- rm -f $(SHARED_OBJECT_FILES)
stamps/copy-source-files.stamp: stamps/patch.stamp
for copy_dir in $(ICEDTEA_COPY_DIRS) ; \
More information about the distro-pkg-dev
mailing list