Changeset 13820 in project

Timestamp:

03/18/09 16:13:13 (11 years ago)

Author:

felix winkelmann

Message:

removed use of soname as it breaks explicit dynamic loading of core libraries; test-dist fixes

Location:

chicken/trunk

Files:

• Makefile.linux (modified) (1 diff)
• defaults.make (modified) (1 diff)
• rules.make (modified) (2 diffs)
• scripts/test-dist.sh (modified) (2 diffs)

chicken/trunk/Makefile.linux

@@ -34 +34 @@
 # options
 
-SONAME_VERSION = .$(BINARYVERSION)
-LIBCHICKEN_SO_LINKER_OPTIONS = -Wl,-soname,libchicken.so$(SONAME_VERSION)
-LIBUCHICKEN_SO_LINKER_OPTIONS = -Wl,-soname,libuchicken.so$(SONAME_VERSION)
 C_COMPILER_OPTIONS = -fno-strict-aliasing -DHAVE_CHICKEN_CONFIG_H
 ifdef DEBUGBUILD

chicken/trunk/defaults.make

@@ -206 +206 @@
 LIBCHICKENGUI_SO_FILE ?= 
 else
-PRIMARY_LIBCHICKEN ?= libchicken$(SO)$(SONAME_VERSION)
-LIBCHICKEN_SO_FILE ?= libchicken$(SO)$(SONAME_VERSION)
-LIBUCHICKEN_SO_FILE ?= libuchicken$(SO)$(SONAME_VERSION)
+PRIMARY_LIBCHICKEN ?= libchicken$(SO)
+LIBCHICKEN_SO_FILE ?= libchicken$(SO)
+LIBUCHICKEN_SO_FILE ?= libuchicken$(SO)
 LIBCHICKENGUI_SO_FILE ?= 
 endif

chicken/trunk/rules.make

@@ -673 +673 @@
 libs: $(TARGETLIBS)
 
-libchicken$(SO)$(SONAME_VERSION): $(LIBCHICKEN_SHARED_OBJECTS) $(APPLY_HACK_OBJECT)
+libchicken$(SO): $(LIBCHICKEN_SHARED_OBJECTS) $(APPLY_HACK_OBJECT)
         $(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_LIBRARY_OPTIONS) $(LIBCHICKEN_SO_LINKER_OPTIONS) \
           $(LINKER_OUTPUT) $^ $(LIBCHICKEN_SO_LIBRARIES)
-ifneq ($(SONAME_VERSION),)
-        ln -sf $(LIBCHICKEN_SO_FILE) libchicken$(SO)
-endif
-
-
-libuchicken$(SO)$(SONAME_VERSION): $(LIBUCHICKEN_SHARED_OBJECTS) $(APPLY_HACK_OBJECT)
+
+
+libuchicken$(SO): $(LIBUCHICKEN_SHARED_OBJECTS) $(APPLY_HACK_OBJECT)
         $(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_LIBRARY_OPTIONS) $(LIBUCHICKEN_SO_LINKER_OPTIONS) \
           $(LINKER_OUTPUT) $^ $(LIBUCHICKEN_SO_LIBRARIES)
-ifneq ($(SONAME_VERSION),)
-        ln -sf $(LIBUCHICKEN_SO_FILE) libuchicken$(SO)
-endif
 
 cygchicken-0.dll: $(LIBCHICKEN_SHARED_OBJECTS) $(APPLY_HACK_OBJECT)
@@ -809 +803 @@
         $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS) $(LIBCHICKEN_SO_FILE) $(DESTDIR)$(ILIBDIR)
         $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS) $(LIBUCHICKEN_SO_FILE) $(DESTDIR)$(ILIBDIR)
-endif
-ifneq ($(SONAME_VERSION),)
-        cd $(DESTDIR)$(ILIBDIR)  && ln -sf $(LIBCHICKEN_SO_FILE) libchicken$(SO)
-        cd $(DESTDIR)$(ILIBDIR)  && ln -sf $(LIBUCHICKEN_SO_FILE) libuchicken$(SO)
 endif
 ifdef WINDOWS

chicken/trunk/scripts/test-dist.sh

@@ -15 +15 @@
 fi
 
-if test $# \!= 2; then
-    echo "usage: test-dist.sh [-bootstrap] PLATFORM [TARBALL]"
-    exit 1
-fi
+case $# in
+    1|2) ;;
+    *) 
+        echo "usage: test-dist.sh [-bootstrap] PLATFORM [TARBALL]"
+        exit 1;;
+esac
 
 platform="$1"
 tarball="$2"
+makeprg=gmake
 
 # use gmake, if available
@@ -43 +46 @@
 # if no tarball given, create one
 if test -z "$tarball"; then
-    $makeprg PLATFORM=$platform PREFIX=$prefix DEBUGBUILD=1 CHICKEN=$prefix/bin/chicken CSI=$prefix/bin/csi dist
+    $prefix/bin/csi -s scripts/makedist.scm --make=$makeprg --platform=$platform
     tarball=chicken-`cat buildversion`.tar.gz
 fi