Changeset 13820 in project


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • chicken/trunk/Makefile.linux

    r12935 r13820  
    3434# options
    3535
    36 SONAME_VERSION = .$(BINARYVERSION)
    37 LIBCHICKEN_SO_LINKER_OPTIONS = -Wl,-soname,libchicken.so$(SONAME_VERSION)
    38 LIBUCHICKEN_SO_LINKER_OPTIONS = -Wl,-soname,libuchicken.so$(SONAME_VERSION)
    3936C_COMPILER_OPTIONS = -fno-strict-aliasing -DHAVE_CHICKEN_CONFIG_H
    4037ifdef DEBUGBUILD
  • chicken/trunk/defaults.make

    r13735 r13820  
    206206LIBCHICKENGUI_SO_FILE ?=
    207207else
    208 PRIMARY_LIBCHICKEN ?= libchicken$(SO)$(SONAME_VERSION)
    209 LIBCHICKEN_SO_FILE ?= libchicken$(SO)$(SONAME_VERSION)
    210 LIBUCHICKEN_SO_FILE ?= libuchicken$(SO)$(SONAME_VERSION)
     208PRIMARY_LIBCHICKEN ?= libchicken$(SO)
     209LIBCHICKEN_SO_FILE ?= libchicken$(SO)
     210LIBUCHICKEN_SO_FILE ?= libuchicken$(SO)
    211211LIBCHICKENGUI_SO_FILE ?=
    212212endif
  • chicken/trunk/rules.make

    r13800 r13820  
    673673libs: $(TARGETLIBS)
    674674
    675 libchicken$(SO)$(SONAME_VERSION): $(LIBCHICKEN_SHARED_OBJECTS) $(APPLY_HACK_OBJECT)
     675libchicken$(SO): $(LIBCHICKEN_SHARED_OBJECTS) $(APPLY_HACK_OBJECT)
    676676        $(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_LIBRARY_OPTIONS) $(LIBCHICKEN_SO_LINKER_OPTIONS) \
    677677          $(LINKER_OUTPUT) $^ $(LIBCHICKEN_SO_LIBRARIES)
    678 ifneq ($(SONAME_VERSION),)
    679         ln -sf $(LIBCHICKEN_SO_FILE) libchicken$(SO)
    680 endif
    681 
    682 
    683 libuchicken$(SO)$(SONAME_VERSION): $(LIBUCHICKEN_SHARED_OBJECTS) $(APPLY_HACK_OBJECT)
     678
     679
     680libuchicken$(SO): $(LIBUCHICKEN_SHARED_OBJECTS) $(APPLY_HACK_OBJECT)
    684681        $(LINKER) $(LINKER_OPTIONS) $(LINKER_LINK_SHARED_LIBRARY_OPTIONS) $(LIBUCHICKEN_SO_LINKER_OPTIONS) \
    685682          $(LINKER_OUTPUT) $^ $(LIBUCHICKEN_SO_LIBRARIES)
    686 ifneq ($(SONAME_VERSION),)
    687         ln -sf $(LIBUCHICKEN_SO_FILE) libuchicken$(SO)
    688 endif
    689683
    690684cygchicken-0.dll: $(LIBCHICKEN_SHARED_OBJECTS) $(APPLY_HACK_OBJECT)
     
    809803        $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS) $(LIBCHICKEN_SO_FILE) $(DESTDIR)$(ILIBDIR)
    810804        $(INSTALL_PROGRAM) $(INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS) $(LIBUCHICKEN_SO_FILE) $(DESTDIR)$(ILIBDIR)
    811 endif
    812 ifneq ($(SONAME_VERSION),)
    813         cd $(DESTDIR)$(ILIBDIR)  && ln -sf $(LIBCHICKEN_SO_FILE) libchicken$(SO)
    814         cd $(DESTDIR)$(ILIBDIR)  && ln -sf $(LIBUCHICKEN_SO_FILE) libuchicken$(SO)
    815805endif
    816806ifdef WINDOWS
  • chicken/trunk/scripts/test-dist.sh

    r13818 r13820  
    1515fi
    1616
    17 if test $# \!= 2; then
    18     echo "usage: test-dist.sh [-bootstrap] PLATFORM [TARBALL]"
    19     exit 1
    20 fi
     17case $# in
     18    1|2) ;;
     19    *)
     20        echo "usage: test-dist.sh [-bootstrap] PLATFORM [TARBALL]"
     21        exit 1;;
     22esac
    2123
    2224platform="$1"
    2325tarball="$2"
     26makeprg=gmake
    2427
    2528# use gmake, if available
     
    4346# if no tarball given, create one
    4447if test -z "$tarball"; then
    45     $makeprg PLATFORM=$platform PREFIX=$prefix DEBUGBUILD=1 CHICKEN=$prefix/bin/chicken CSI=$prefix/bin/csi dist
     48    $prefix/bin/csi -s scripts/makedist.scm --make=$makeprg --platform=$platform
    4649    tarball=chicken-`cat buildversion`.tar.gz
    4750fi
Note: See TracChangeset for help on using the changeset viewer.