gnustep/tools-make
0
0
Fork 0
mirror of https://github.com/gnustep/tools-make.git synced 2025-04-23 22:33:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge from dawn

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@4853 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 1999-09-09 02:56:20 +00:00
parent 6dd0dcd98e
commit 4048dc6886
11 changed files with 173 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
ChangeLog
View file

@ -1,3 +1,46 @@
1999-09-07 Adam Fedor <fedor@gnu.org>
* Version: 0.6.0
* GNUstep.csh.in: Don't set GNUSTEP_HOST if already set.
* GNUstep.sh.in: Likewise.
* configure.in: Add test for solaris libraries
* target.make: Use -lposix for Solaris (regardless of threaded).
1999-09-07 David Lazaro Saz
* configure.in: Added threading support for FreeBSD.
* target.make: Likewise.
1999-08-15 Adam Fedor <fedor@gnu.org>
* subproject.make (internal-subproj-all): Make sure files from
subprojects of subprojects get linked. (Patch from Pedro Ivo
Andrade Tavares <ptavares@iname.com>).
* target.make: Add partial OSF support.
1999-08-09 Adam Fedor <fedor@gnu.org>
* GNUstep.csh.in: Fix the setting of GNUSTEP_MAKEFILES (patch
from Christopher Seawood <cls@seawood.org>).
* target.make: Change freebsd3 to freebsd to find all versions,
except put freebsd2 first so it is still unique.
1999-08-09 Richard Frith-Macdonald <richard@brainstorm.co.uk>
Fixes so that things don't bomb out if you don't have write access
to your current directory.
* GNUstep.csh.in: Run config.guess in /tmp
* GNUstep.sh.in: ditto
* executable.template.in: ditto
* openapp.in: ditto
* opentool: ditto
* opentool.in: ditto
1999-08-03 Richard Frith-Macdonald <richard@brainstorm.co.uk>
* application.make: Make installation directory if necessary.

8
GNUstep.csh.in
View file

@ -33,15 +33,17 @@ setenv GNUSTEP_LOCAL_ROOT @prefix@/Local
setenv GNUSTEP_USER_ROOT ~/GNUstep
if ( ! ${?GNUSTEP_BUILD_ROOT} ) then
setenv GNUSTEP_MAKEFILES=${GNUSTEP_SYSTEM_ROOT}/Makefiles
setenv GNUSTEP_MAKEFILES ${GNUSTEP_SYSTEM_ROOT}/Makefiles
else
setenv GNUSTEP_MAKEFILES=${GNUSTEP_BUILD_ROOT}/Makefiles
setenv GNUSTEP_MAKEFILES ${GNUSTEP_BUILD_ROOT}/Makefiles
endif
#
# Determine the host information
#
setenv GNUSTEP_HOST `${GNUSTEP_SYSTEM_ROOT}/Makefiles/config.guess`
if ( ! ${?GNUSTEP_HOST} ) then
setenv GNUSTEP_HOST `(cd /tmp; ${GNUSTEP_SYSTEM_ROOT}/Makefiles/config.guess)`
endif
setenv GNUSTEP_HOST_CPU `${GNUSTEP_SYSTEM_ROOT}/Makefiles/cpu.sh $GNUSTEP_HOST`
setenv GNUSTEP_HOST_VENDOR `${GNUSTEP_SYSTEM_ROOT}/Makefiles/vendor.sh $GNUSTEP_HOST`
setenv GNUSTEP_HOST_OS `${GNUSTEP_SYSTEM_ROOT}/Makefiles/os.sh $GNUSTEP_HOST`

4
GNUstep.sh.in
View file

@ -44,7 +44,9 @@ export GNUSTEP_MAKEFILES
#
# Determine the host information
#
GNUSTEP_HOST=`$GNUSTEP_MAKEFILES/config.guess`
if [ -z "$GNUSTEP_HOST" ]; then
GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_MAKEFILES/config.guess)`
fi
GNUSTEP_HOST_CPU=`$GNUSTEP_MAKEFILES/cpu.sh $GNUSTEP_HOST`
GNUSTEP_HOST_VENDOR=`$GNUSTEP_MAKEFILES/vendor.sh $GNUSTEP_HOST`
GNUSTEP_HOST_OS=`$GNUSTEP_MAKEFILES/os.sh $GNUSTEP_HOST`

42
configure vendored
View file

@ -2857,6 +2857,12 @@ fi
#--------------------------------------------------------------------
echo $ac_n "checking whether objc has thread support""... $ac_c" 1>&6
echo "configure:2860: checking whether objc has thread support" >&5
extra_LIBS=""
case "${target_os}" in
solaris*)
extra_LIBS="-lposix4"
;;
esac
saved_LIBS="$LIBS"
objc_thread_lib=""
if test $host_os = linux-gnu; then
@ -2865,11 +2871,33 @@ if test $host_os = linux-gnu; then
objc_threaded="-lpthread"
else
cat > conftest.$ac_ext <<EOF
#line 2869 "configure"
#line 2875 "configure"
#include "confdefs.h"
#include "config_thread.m"
EOF
if { (eval echo configure:2873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:2879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
objc_threaded="-lpthread"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -fr conftest*
objc_threaded=""
fi
rm -fr conftest*
fi
elif test "`echo $host_os|sed 's/[0-9].*//'|sed s/elf//`" = freebsd; then
LIBS="-lpthread -lobjc"
if test "$cross_compiling" = yes; then
objc_threaded="-lpthread"
else
cat > conftest.$ac_ext <<EOF
#line 2897 "configure"
#include "confdefs.h"
#include "config_thread.m"
EOF
if { (eval echo configure:2901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
objc_threaded="-lpthread"
else
@ -2887,11 +2915,11 @@ fi
objc_threaded="-lpcthread"
else
cat > conftest.$ac_ext <<EOF
#line 2891 "configure"
#line 2919 "configure"
#include "confdefs.h"
#include "config_thread.m"
EOF
if { (eval echo configure:2895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:2923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
objc_threaded="-lpcthread"
else
@ -2905,16 +2933,16 @@ fi
fi
else
LIBS="-lobjc $LIBS"
LIBS="-lobjc $LIBS $extra_LIBS"
if test "$cross_compiling" = yes; then
objc_threaded="-lthread"
else
cat > conftest.$ac_ext <<EOF
#line 2914 "configure"
#line 2942 "configure"
#include "confdefs.h"
#include "config_thread.m"
EOF
if { (eval echo configure:2918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
if { (eval echo configure:2946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then
objc_threaded="-lthread"
else

12
configure.in
View file

@ -299,19 +299,29 @@ AC_SUBST(ac_cv_library_combo)
# Check if libobjc was compiled with thread support.
#--------------------------------------------------------------------
AC_MSG_CHECKING(whether objc has thread support)
extra_LIBS=""
case "${target_os}" in
solaris*)
extra_LIBS="-lposix4"
;;
esac
saved_LIBS="$LIBS"
objc_thread_lib=""
if test $host_os = linux-gnu; then
LIBS="-lobjc -lpthread"
AC_TRY_RUN([#include "config_thread.m"], objc_threaded="-lpthread",
objc_threaded="", objc_threaded="-lpthread")
elif test "`echo $host_os|sed 's/[[0-9]].*//'|sed s/elf//`" = freebsd; then
LIBS="-lpthread -lobjc"
AC_TRY_RUN([#include "config_thread.m"], objc_threaded="-lpthread",
objc_threaded="", objc_threaded="-lpthread")
if test x"$objc_threaded" = x""; then
LIBS="-lobjc -lpcthread"
AC_TRY_RUN([#include "config_thread.m"], objc_threaded="-lpcthread",
objc_threaded="", objc_threaded="-lpcthread")
fi
else
LIBS="-lobjc $LIBS"
LIBS="-lobjc $LIBS $extra_LIBS"
AC_TRY_RUN([#include "config_thread.m"], objc_threaded="-lthread",
objc_threaded="", objc_threaded="-lthread")
fi

2
executable.template.in
View file

@ -152,7 +152,7 @@ fi
# Determine the host information
#
if [ -z "$GNUSTEP_HOST" ]; then
GNUSTEP_HOST=`$GNUSTEP_SYSTEM_ROOT/Makefiles/config.guess`
GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/Makefiles/config.guess)`
export GNUSTEP_HOST
fi
if [ -z "$GNUSTEP_HOST_CPU" ]; then

2
openapp.in
View file

@ -122,7 +122,7 @@ fi
# Determine the host information
#
if [ -z "$GNUSTEP_HOST" ]; then
GNUSTEP_HOST=`$GNUSTEP_SYSTEM_ROOT/Makefiles/config.guess`
GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/Makefiles/config.guess)`
export GNUSTEP_HOST
fi
if [ -z "$GNUSTEP_HOST_CPU" ]; then

2
opentool
View file

@ -90,7 +90,7 @@ fi
# Determine the host information
#
if [ -z "$GNUSTEP_HOST" ]; then
GNUSTEP_HOST=`$GNUSTEP_SYSTEM_ROOT/Makefiles/config.guess`
GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/Makefiles/config.guess)`
export GNUSTEP_HOST
fi
if [ -z "$GNUSTEP_HOST_CPU" ]; then

2
opentool.in
View file

@ -90,7 +90,7 @@ fi
# Determine the host information
#
if [ -z "$GNUSTEP_HOST" ]; then
GNUSTEP_HOST=`$GNUSTEP_SYSTEM_ROOT/Makefiles/config.guess`
GNUSTEP_HOST=`(cd /tmp; $GNUSTEP_SYSTEM_ROOT/Makefiles/config.guess)`
export GNUSTEP_HOST
fi
if [ -z "$GNUSTEP_HOST_CPU" ]; then

3
subproject.make
View file

@ -63,7 +63,8 @@ internal-subproj-all:: before-all before-$(TARGET)-all $(GNUSTEP_OBJ_DIR) \
$(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) \
after-$(TARGET)-all after-all
$(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT): $(C_OBJ_FILES) $(OBJC_OBJ_FILES)
$(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT): $(C_OBJ_FILES) $(OBJC_OBJ_FILES) \
$(SUBPROJECT_OBJ_FILES)
$(OBJ_MERGE_CMD)
before-$(TARGET)-all::

102
target.make
View file

@ -45,12 +45,10 @@ ifeq ($(findstring linux-gnu, $(GNUSTEP_TARGET_OS)), linux-gnu)
endif
endif
ifeq ($(findstring solaris, $(GNUSTEP_TARGET_OS)), solaris)
ifeq ("$(objc_threaded)","")
TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lsocket -lnsl -ldl -lm -lposix4
else
TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) $(objc_threaded) -lsocket -lnsl -ldl -lm -lposix4
ifneq ("$(objc_threaded)","")
INTERNAL_CFLAGS = -D_REENTRANT
INTERNAL_OBJCFLAGS = -D_REENTRANT
TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) $(objc_threaded) -lsocket -lnsl -ldl -lm
endif
endif
ifeq ($(findstring irix, $(GNUSTEP_TARGET_OS)), irix)
@ -66,7 +64,13 @@ ifeq ($(findstring aix4.1, $(GNUSTEP_TARGET_OS)), aix4.1)
TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lm
endif
ifeq ($(findstring freebsd, $(GNUSTEP_TARGET_OS)), freebsd)
TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lm
ifeq ("$(objc_threaded)","")
TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lm
else
INTERNAL_CFLAGS = -D_REENTRANT
INTERNAL_OBJCFLAGS = -D_REENTRANT
TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) $(objc_threaded) -lm
endif
endif
ifeq ($(findstring netbsd, $(GNUSTEP_TARGET_OS)), netbsd)
TARGET_SYSTEM_LIBS := $(CONFIG_SYSTEM_LIBS) -lm
@ -291,6 +295,33 @@ endif
#
####################################################
####################################################
#
# FreeBSD a.out (2.2.x)
#
ifeq ($(findstring freebsd2, $(GNUSTEP_TARGET_OS)), freebsd2)
HAVE_SHARED_LIBS = no
SHARED_LIB_LINK_CMD = \
$(CC) -shared -Wl,-soname,$(VERSION_LIBRARY_FILE) \
-o $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) $^ /usr/lib/c++rt0.o;\
(cd $(GNUSTEP_OBJ_DIR); \
rm -f $(LIBRARY_FILE); \
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
SHARED_CFLAGS += -fPIC
SHARED_LIBEXT = .so
HAVE_BUNDLES = yes
BUNDLE_LD = $(CC)
BUNDLE_CFLAGS += -fPIC
BUNDLE_LDFLAGS += -shared
ADDITIONAL_LDFLAGS += -rdynamic
endif
#
# end FreeBSD A.out
#
####################################################
####################################################
#
# FreeBSD ELF
@ -320,33 +351,6 @@ endif
#
####################################################
####################################################
#
# FreeBSD a.out (2.2.x)
#
ifeq ($(findstring freebsd2, $(GNUSTEP_TARGET_OS)), freebsd2)
HAVE_SHARED_LIBS = no
SHARED_LIB_LINK_CMD = \
$(CC) -shared -Wl,-soname,$(VERSION_LIBRARY_FILE) \
-o $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) $^ /usr/lib/c++rt0.o;\
(cd $(GNUSTEP_OBJ_DIR); \
rm -f $(LIBRARY_FILE); \
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
SHARED_CFLAGS += -fPIC
SHARED_LIBEXT = .so
HAVE_BUNDLES = yes
BUNDLE_LD = $(CC)
BUNDLE_CFLAGS += -fPIC
BUNDLE_LDFLAGS += -shared
ADDITIONAL_LDFLAGS += -rdynamic
endif
#
# end FreeBSD A.out
#
####################################################
####################################################
#
# NetBSD
@ -411,6 +415,37 @@ endif
#
####################################################
####################################################
#
# OSF
#
ifeq ($(findstring osf, $(GNUSTEP_TARGET_OS)), osf)
HAVE_SHARED_LIBS = no
SHARED_LIB_LINK_CMD = \
$(CC) -shared -Wl,-soname,$(VERSION_LIBRARY_FILE) \
-o $(GNUSTEP_OBJ_DIR)/$(VERSION_LIBRARY_FILE) $^ ;\
(cd $(GNUSTEP_OBJ_DIR); \
rm -f $(LIBRARY_FILE); \
$(LN_S) $(VERSION_LIBRARY_FILE) $(LIBRARY_FILE))
OBJ_MERGE_CMD = \
$(CC) -nostdlib -r -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
SHARED_CFLAGS += -fPIC
SHARED_LIBEXT = .so
HAVE_BUNDLES = yes
BUNDLE_LD = $(CC)
BUNDLE_CFLAGS += -fPIC
BUNDLE_LDFLAGS += -shared
ADDITIONAL_LDFLAGS += -rdynamic
# Newer gcc's don't define this in Objective-C programs:
ADDITIONAL_CPPFLAGS += -D__LANGUAGES_C__
endif
#
# end OSF
#
####################################################
####################################################
#
# IRIX
@ -461,6 +496,9 @@ AFTER_INSTALL_SHARED_LIB_COMMAND = \
$(LN_S) $(SONAME_LIBRARY_FILE) $(LIBRARY_FILE); \
)
OBJ_MERGE_CMD = \
$(CC) -nostdlib -r -o $(GNUSTEP_OBJ_DIR)/$(SUBPROJECT_PRODUCT) $^ ;
SHARED_CFLAGS += -fpic -fPIC
SHARED_LIBEXT = .so