Patchwork libjava/classpath configure update for FreeBSD 10 and up

login
register
mail settings
Submitter Andreas Tobler
Date Nov. 28, 2011, 7:45 p.m.
Message ID <4ED3E4C3.5000304@fgznet.ch>
Download mbox | patch
Permalink /patch/128069/
State New
Headers show

Comments

Andreas Tobler - Nov. 28, 2011, 7:45 p.m.
All,

I'd like to commit the attached patch to trunk and gcc-4.6.
It is a follow up from this one:

http://gcc.gnu.org/ml/gcc-cvs/2011-11/msg00886.html

I missed this one because in my setup I didn't build any shared 
libraries from classpath. The config.rpath patch is already sent to 
classpath.

Any objections to this patch?

Otherwise I'm going to commit within 24h.

TIA,
Andreas

libjava/classpath/ChangeLog.gcj:

2011-11-28  Andreas Tobler  <andreast@fgznet.ch>

	* config.rpath (ld_shlibs): Fix detection of FreeBSD-10 and up.
	(libname_spec): Likewise.
	* configure: Regenerate with autoconf -I ../../.
Andreas Tobler - Nov. 29, 2011, 8:14 p.m.
On 28.11.11 20:45, Andreas Tobler wrote:
> All,
>
> I'd like to commit the attached patch to trunk and gcc-4.6.
> It is a follow up from this one:
>
> http://gcc.gnu.org/ml/gcc-cvs/2011-11/msg00886.html
>
> I missed this one because in my setup I didn't build any shared
> libraries from classpath. The config.rpath patch is already sent to
> classpath.
>
> Any objections to this patch?
>
> Otherwise I'm going to commit within 24h.

Committed:

http://gcc.gnu.org/ml/gcc-cvs/2011-11/msg01110.html

http://gcc.gnu.org/ml/gcc-cvs/2011-11/msg01111.html

Andreas

> TIA,
> Andreas
>
> libjava/classpath/ChangeLog.gcj:
>
> 2011-11-28  Andreas Tobler<andreast@fgznet.ch>
>
> 	* config.rpath (ld_shlibs): Fix detection of FreeBSD-10 and up.
> 	(libname_spec): Likewise.
> 	* configure: Regenerate with autoconf -I ../../.

Patch

Index: configure
===================================================================
--- configure	(revision 181783)
+++ configure	(working copy)
@@ -10025,7 +10025,7 @@ 
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -10941,7 +10941,7 @@ 
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -10959,7 +10959,7 @@ 
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -14225,7 +14225,7 @@ 
         esac
         ;;
 
-      freebsd[12]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         ld_shlibs_CXX=no
@@ -16000,7 +16000,7 @@ 
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -16018,7 +16018,7 @@ 
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
Index: config.rpath
===================================================================
--- config.rpath	(revision 181783)
+++ config.rpath	(working copy)
@@ -361,7 +361,7 @@ 
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       ;;
-    freebsd2*)
+    freebsd2.*)
       hardcode_direct=yes
       hardcode_minus_L=yes
       ;;
@@ -533,7 +533,7 @@ 
     ;;
   freebsd* | dragonfly*)
     case "$host_os" in
-      freebsd[123]*)
+      freebsd[23].*)
         library_names_spec='$libname$shrext$versuffix' ;;
       *)
         library_names_spec='$libname$shrext' ;;