View | Details | Raw Unified | Return to bug 30148
Collapse All | Expand All

(-)libtool/Makefile (-1 / +1 lines)
Lines 7-13 Link Here
7
7
8
PORTNAME=	libtool
8
PORTNAME=	libtool
9
PORTVERSION=	1.3.4
9
PORTVERSION=	1.3.4
10
PORTREVISION=	2
10
PORTREVISION=	3
11
CATEGORIES=	devel
11
CATEGORIES=	devel
12
MASTER_SITES=	${MASTER_SITE_GNU}
12
MASTER_SITES=	${MASTER_SITE_GNU}
13
MASTER_SITE_SUBDIR=	libtool
13
MASTER_SITE_SUBDIR=	libtool
(-)libtool/files/patch-ac (-8 / +52 lines)
Lines 1-5 Link Here
1
--- ltconfig.orig	Tue Dec  7 23:50:48 1999
1
--- ltconfig.orig	Tue Dec  7 22:50:48 1999
2
+++ ltconfig	Wed Sep 20 11:11:39 2000
2
+++ ltconfig	Wed Mar 21 00:06:38 2001
3
@@ -169,7 +169,7 @@
3
@@ -169,7 +169,7 @@
4
 # Constants:
4
 # Constants:
5
 PROGRAM=ltconfig
5
 PROGRAM=ltconfig
Lines 55-61 Link Here
55
   --enable-dlopen) enable_dlopen=yes ;;
55
   --enable-dlopen) enable_dlopen=yes ;;
56
 
56
 
57
   --enable-win32-dll) enable_win32_dll=yes ;;
57
   --enable-win32-dll) enable_win32_dll=yes ;;
58
@@ -971,11 +985,11 @@
58
@@ -591,6 +605,25 @@
59
   fi
60
   $rm conftest.c
61
   echo "$ac_t$with_gcc" 1>&6
62
+
63
+  # Check if the compiler is Compaq C
64
+  if test "$with_gcc" != yes; then
65
+    with_ccc=no
66
+    echo $ac_n "checking whether we are using Compaq C... $ac_c" 1>&6
67
+    echo "$progname:581: checking whether we are using Compaq C" >&5
68
+
69
+    $rm conftest.c
70
+    cat > conftest.c <<EOF
71
+  #ifdef __DECC
72
+    yes;
73
+  #endif
74
+EOF
75
+    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
76
+      with_ccc=yes
77
+    fi
78
+    $rm conftest.c
79
+    echo "$ac_t$with_ccc" 1>&6
80
+  fi
81
 fi
82
 
83
 # Allow CC to be a program name with arguments.
84
@@ -693,6 +726,17 @@
85
     pic_flag='-fPIC'
86
     ;;
87
   esac
88
+elif test "$with_ccc" = yes; then
89
+  case "$host_os" in
90
+  osf[345]* | linux-gnu* | freebsd*)
91
+    # All Compaq C alpha code is PIC.
92
+    wl='-Wl,'
93
+    link_static_flag='-non_shared'
94
+    ;;
95
+  *)
96
+    can_build_shared=no
97
+    ;;
98
+  esac
99
 else
100
   # PORTME Check for PIC flags for the system compiler.
101
   case "$host_os" in
102
@@ -971,11 +1015,11 @@
59
   $rm conftest.dat
103
   $rm conftest.dat
60
   if ln -s X conftest.dat 2>/dev/null; then
104
   if ln -s X conftest.dat 2>/dev/null; then
61
     $rm conftest.dat
105
     $rm conftest.dat
Lines 69-75 Link Here
69
     echo "$ac_t"yes 1>&6
113
     echo "$ac_t"yes 1>&6
70
   else
114
   else
71
     echo "$ac_t"no 1>&6
115
     echo "$ac_t"no 1>&6
72
@@ -1226,8 +1240,8 @@
116
@@ -1226,8 +1270,8 @@
73
 
117
 
74
   *)
118
   *)
75
     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
119
     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
Lines 80-86 Link Here
80
     else
124
     else
81
       ld_shlibs=no
125
       ld_shlibs=no
82
     fi
126
     fi
83
@@ -1353,14 +1367,6 @@
127
@@ -1353,14 +1397,6 @@
84
     hardcode_shlibpath_var=no
128
     hardcode_shlibpath_var=no
85
     ;;
129
     ;;
86
 
130
 
Lines 95-101 Link Here
95
   hpux9* | hpux10* | hpux11*)
139
   hpux9* | hpux10* | hpux11*)
96
     case "$host_os" in
140
     case "$host_os" in
97
     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' ;;
141
     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' ;;
98
@@ -1775,7 +1781,7 @@
142
@@ -1775,7 +1811,7 @@
99
 version_type=none
143
 version_type=none
100
 dynamic_linker="$host_os ld.so"
144
 dynamic_linker="$host_os ld.so"
101
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
145
 sys_lib_dlsearch_path_spec="/lib /usr/lib"
Lines 104-110 Link Here
104
 file_magic_cmd=
148
 file_magic_cmd=
105
 file_magic_test_file=
149
 file_magic_test_file=
106
 deplibs_check_method='unknown'
150
 deplibs_check_method='unknown'
107
@@ -1874,18 +1880,21 @@
151
@@ -1874,18 +1910,21 @@
108
   case "$version_type" in
152
   case "$version_type" in
109
     freebsd-elf*)
153
     freebsd-elf*)
110
       deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
154
       deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
Lines 134-140 Link Here
134
   shlibpath_var=LD_LIBRARY_PATH
178
   shlibpath_var=LD_LIBRARY_PATH
135
   case "$host_os" in
179
   case "$host_os" in
136
   freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*)
180
   freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*)
137
@@ -2776,6 +2785,15 @@
181
@@ -2776,6 +2815,15 @@
138
 
182
 
139
 # Shell to use when invoking shell scripts.
183
 # Shell to use when invoking shell scripts.
140
 SHELL=$LTSHELL
184
 SHELL=$LTSHELL

Return to bug 30148