From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18245 invoked by alias); 28 Nov 2011 19:45:30 -0000 Received: (qmail 18222 invoked by uid 22791); 28 Nov 2011 19:45:28 -0000 X-SWARE-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_NONE,RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail.fgznet.ch (HELO smtp.fgznet.ch) (81.92.96.47) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 28 Nov 2011 19:45:14 +0000 Received: from deuterium.andreas.nets (dhclient-91-190-14-19.flashcable.ch [91.190.14.19]) by smtp.fgznet.ch (8.13.8/8.13.8/Submit_SMTPAUTH) with ESMTP id pASJiAIC069602; Mon, 28 Nov 2011 20:44:14 +0100 (CET) (envelope-from andreast-list@fgznet.ch) Message-ID: <4ED3E4C3.5000304@fgznet.ch> Date: Mon, 28 Nov 2011 19:45:00 -0000 From: Andreas Tobler User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.5; rv:8.0) Gecko/20111105 Thunderbird/8.0 MIME-Version: 1.0 To: GCC Patches , Java Patches Subject: [patch] libjava/classpath configure update for FreeBSD 10 and up Content-Type: multipart/mixed; boundary="------------000403040008050404040008" X-IsSubscribed: yes Mailing-List: contact java-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: java-patches-owner@gcc.gnu.org X-SW-Source: 2011-q4/txt/msg00011.txt.bz2 This is a multi-part message in MIME format. --------------000403040008050404040008 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 613 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 * config.rpath (ld_shlibs): Fix detection of FreeBSD-10 and up. (libname_spec): Likewise. * configure: Regenerate with autoconf -I ../../. --------------000403040008050404040008 Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0"; name="cp_config_head.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="cp_config_head.diff" Content-length: 2033 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' ;; --------------000403040008050404040008--