Date: Mon, 11 Feb 2013 10:01:02 -0500 From: "Steve Wills" <swills@FreeBSD.org> To: "Andriy Gapon" <avg@FreeBSD.org> Cc: ruby@FreeBSD.org Subject: Re: ruby-1.9.pc; strange/harmful entry Message-ID: <70956dcb2af6c26a3813ce6ec56a7a92.squirrel@mouf.net> In-Reply-To: <5118A8FF.4070007@FreeBSD.org> References: <510FD6A0.2010303@FreeBSD.org> <5117FB5E.1000502@mouf.net> <51181185.1080802@FreeBSD.org> <5118488D.3080706@FreeBSD.org> <51186D35.8080207@mouf.net> <5118A8FF.4070007@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
------=_20130211100102_83191 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8bit > >From a quick look at configure.in I see that there is a special case for freebsd| dragonflybsd: > > [freebsd*|dragonfly*], [ > ... > DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)' > > I think that this assignment should be removed. That's the only > occurrence of > -Wl,-soname in DLDFLAGS in the whole script. > > Possibly we should do instead what is done for netbsd elsewhere in the > script: > [netbsd*], [ > ... > LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' > > In freebsd/dragonfly block (preceding the netbsd one) this could be > written more > compactly as: > LIBRUBY_DLDFLAGS='-Wl,-soname,$(LIBRUBY_SO)' > Yep, I had wondered about that, but was initially hesitant to touch configure.in. Thanks for taking a look. Try the attached patch, also available here: http://meatwad.mouf.net/~swills/ruby_pc.diff2.txt This is build tested, but nothing else. I'll try to do some more testing. Steve ------=_20130211100102_83191 Content-Type: text/plain; name="ruby_pc.diff2.txt" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="ruby_pc.diff2.txt" Index: Mk/bsd.ruby.mk =================================================================== --- Mk/bsd.ruby.mk (revision 311047) +++ Mk/bsd.ruby.mk (working copy) @@ -194,7 +194,7 @@ # Ruby 1.9 # RUBY_RELVERSION= 1.9.3 -RUBY_PORTREVISION= 0 +RUBY_PORTREVISION= 1 RUBY_PORTEPOCH= 1 RUBY_PATCHLEVEL= 327 Index: lang/ruby19/files/patch-configure.in =================================================================== --- lang/ruby19/files/patch-configure.in (revision 311047) +++ lang/ruby19/files/patch-configure.in (working copy) @@ -1,6 +1,6 @@ ---- configure.in.orig 2012-02-15 19:26:09.000000000 -0500 -+++ configure.in 2012-02-16 22:28:27.617422641 -0500 -@@ -1118,11 +1118,11 @@ +--- configure.in.orig 2013-02-11 14:33:14.000000000 +0000 ++++ configure.in 2013-02-11 14:30:13.000000000 +0000 +@@ -1129,11 +1129,11 @@ [superux*], [ ac_cv_func_setitimer=no ], [ LIBS="-lm $LIBS"]) @@ -17,7 +17,7 @@ if test "${enable_win95}" = maybe; then AC_HAVE_LIBRARY(unicows, [enable_win95=yes], [enable_win95=no]) fi -@@ -1815,7 +1815,7 @@ +@@ -1828,7 +1828,7 @@ fi if test x"$enable_pthread" = xyes; then @@ -26,7 +26,7 @@ AC_CHECK_LIB($pthread_lib, pthread_kill, rb_with_pthread=yes, rb_with_pthread=no) if test "$rb_with_pthread" = "yes"; then break; fi -@@ -1823,6 +1823,7 @@ +@@ -1836,6 +1836,7 @@ if test x"$rb_with_pthread" = xyes; then AC_DEFINE(_REENTRANT) AC_DEFINE(_THREAD_SAFE) @@ -34,3 +34,19 @@ AC_DEFINE(HAVE_LIBPTHREAD) AC_CHECK_HEADERS(pthread_np.h, [], [], [@%:@include <pthread.h>]) AS_CASE([$pthread_lib], +@@ -2080,7 +2081,6 @@ + : ${LDSHARED='$(CC) -shared'} + if test "$rb_cv_binary_elf" = yes; then + LDFLAGS="$LDFLAGS -rdynamic" +- DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$(.TARGET)' + else + test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED="ld -Bshareable" + fi +@@ -2385,6 +2385,7 @@ + [freebsd*|dragonfly*], [ + SOLIBS='$(LIBS)' + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR)' ++ LIBRUBY_DLDFLAGS='-Wl,-soname,$(LIBRUBY_SO)' + if test "$rb_cv_binary_elf" != "yes" ; then + LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)" + LIBRUBY_ALIASES='' ------=_20130211100102_83191--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?70956dcb2af6c26a3813ce6ec56a7a92.squirrel>