Date: Wed, 21 Mar 2001 00:51:30 +0100 From: Christian Weisgerber <naddy@mips.inka.de> To: freebsd-alpha@freebsd.org Cc: reg@FreeBSD.org Subject: Preliminary libtool patch Message-ID: <20010321005130.A64770@kemoauc.mips.inka.de>
next in thread | raw e-mail | index | archive | help
--VbJkn9YxBvnuCH5J
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Here's a preliminary patch to support ccc in libtool (via our
devel/libtool port).
I'm really clueless about libtool. This patch allows building
shared and static libraries with ccc. There may be further issues
I'm as yet unaware of.
People may want to play with this.
--
Christian "naddy" Weisgerber naddy@mips.inka.de
--VbJkn9YxBvnuCH5J
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="libtool.patch"
diff -uNr /usr/ports/devel/libtool/Makefile libtool/Makefile
--- /usr/ports/devel/libtool/Makefile Mon Feb 5 14:48:20 2001
+++ libtool/Makefile Wed Mar 21 00:09:59 2001
@@ -7,7 +7,7 @@
PORTNAME= libtool
PORTVERSION= 1.3.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool
diff -uNr /usr/ports/devel/libtool/files/patch-ac libtool/files/patch-ac
--- /usr/ports/devel/libtool/files/patch-ac Mon Sep 25 09:38:14 2000
+++ libtool/files/patch-ac Wed Mar 21 00:07:02 2001
@@ -1,5 +1,5 @@
---- ltconfig.orig Tue Dec 7 23:50:48 1999
-+++ ltconfig Wed Sep 20 11:11:39 2000
+--- ltconfig.orig Tue Dec 7 22:50:48 1999
++++ ltconfig Wed Mar 21 00:06:38 2001
@@ -169,7 +169,7 @@
# Constants:
PROGRAM=ltconfig
@@ -55,7 +55,51 @@
--enable-dlopen) enable_dlopen=yes ;;
--enable-win32-dll) enable_win32_dll=yes ;;
-@@ -971,11 +985,11 @@
+@@ -591,6 +605,25 @@
+ fi
+ $rm conftest.c
+ echo "$ac_t$with_gcc" 1>&6
++
++ # Check if the compiler is Compaq C
++ if test "$with_gcc" != yes; then
++ with_ccc=no
++ echo $ac_n "checking whether we are using Compaq C... $ac_c" 1>&6
++ echo "$progname:581: checking whether we are using Compaq C" >&5
++
++ $rm conftest.c
++ cat > conftest.c <<EOF
++ #ifdef __DECC
++ yes;
++ #endif
++EOF
++ if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++ with_ccc=yes
++ fi
++ $rm conftest.c
++ echo "$ac_t$with_ccc" 1>&6
++ fi
+ fi
+
+ # Allow CC to be a program name with arguments.
+@@ -693,6 +726,17 @@
+ pic_flag='-fPIC'
+ ;;
+ esac
++elif test "$with_ccc" = yes; then
++ case "$host_os" in
++ osf[345]* | linux-gnu* | freebsd*)
++ # All Compaq C alpha code is PIC.
++ wl='-Wl,'
++ link_static_flag='-non_shared'
++ ;;
++ *)
++ can_build_shared=no
++ ;;
++ esac
+ else
+ # PORTME Check for PIC flags for the system compiler.
+ case "$host_os" in
+@@ -971,11 +1015,11 @@
$rm conftest.dat
if ln -s X conftest.dat 2>/dev/null; then
$rm conftest.dat
@@ -69,7 +113,7 @@
echo "$ac_t"yes 1>&6
else
echo "$ac_t"no 1>&6
-@@ -1226,8 +1240,8 @@
+@@ -1226,8 +1270,8 @@
*)
if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
@@ -80,7 +124,7 @@
else
ld_shlibs=no
fi
-@@ -1353,14 +1367,6 @@
+@@ -1353,14 +1397,6 @@
hardcode_shlibpath_var=no
;;
@@ -95,7 +139,7 @@
hpux9* | hpux10* | hpux11*)
case "$host_os" in
hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;;
-@@ -1775,7 +1781,7 @@
+@@ -1775,7 +1811,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -104,7 +148,7 @@
file_magic_cmd=
file_magic_test_file=
deplibs_check_method='unknown'
-@@ -1874,18 +1880,21 @@
+@@ -1874,18 +1910,21 @@
case "$version_type" in
freebsd-elf*)
deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
@@ -134,7 +178,7 @@
shlibpath_var=LD_LIBRARY_PATH
case "$host_os" in
freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*)
-@@ -2776,6 +2785,15 @@
+@@ -2776,6 +2815,15 @@
# Shell to use when invoking shell scripts.
SHELL=$LTSHELL
--VbJkn9YxBvnuCH5J--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-alpha" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010321005130.A64770>