Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 14 Dec 1998 12:39:41 +0900 (JST)
From:      Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
To:        FreeBSD-gnats-submit@FreeBSD.ORG
Cc:        shige@kuis.kyoto-u.ac.jp
Subject:   ports/9070: Update port: devel/libtool
Message-ID:  <19981214123941G.shige@kuis.kyoto-u.ac.jp>

next in thread | raw e-mail | index | archive | help

>Number:         9070
>Category:       ports
>Synopsis:       Update port: devel/libtool
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    freebsd-ports
>State:          open
>Quarter:
>Keywords:
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 13 19:40:00 PST 1998
>Last-Modified:
>Originator:     Shigeyuki FUKUSHIMA
>Organization:
Dept. of Information Science, Kyoto Univ., JAPAN
>Release:        FreeBSD 3.0-CURRENT i386
>Environment:

	FreeBSD 2.2.8-RELEASE i386
	FreeBSD 3.0-RELEASE i386
	FreeBSD 2.2-STABLE i386
	FreeBSD 3.0-CURRENT i386

>Description:

Update port: devel/libtool

This update fixes PORTOBJFORMAT problem.

This problem is the following:

   ${PREFIX}/share/libtool/ltmain.sh and ${PREFIX}/share/libtool/ltconfig
   are libtool sample files. In making some software (without the port system),
   these files are used as is. 
   But these files reuires the assumptions that PORTOBJFORMAT variable must
   be defined in using these files.
   As you know, PORTOBJFORMAT is defined in bsd.port.mk.

   PORTOBJFORMAT should be used *ONLY* in the closure of the port system.
   But it cannot be not used in installed stuff! 


This fix is approved by port maintainer: m-kasahr@sra.co.jp.

Thnak you.
--- shige


>How-To-Repeat:

>Fix:
	
diff -urN /usr/ports/devel/libtool/patches/patch-ac libtool/patches/patch-ac
--- /usr/ports/devel/libtool/patches/patch-ac	Thu Sep 24 01:15:58 1998
+++ libtool/patches/patch-ac	Sat Dec 12 09:11:57 1998
@@ -1,44 +1,17 @@
---- ltmain.sh.orig	Wed Sep 23 23:37:14 1998
-+++ ltmain.sh	Wed Sep 23 23:38:02 1998
-@@ -967,6 +967,16 @@
-         versuffix="$current.$revision"
-         ;;
- 
-+      freebsd)
-+        version_vars="$version_vars major versuffix"
-+        major="$current"
-+	if [ $PORTOBJFORMAT = elf ]; then
-+        versuffix="$current";
-+	else
-+        versuffix="$current.$revision";
-+	fi
-+        ;;
-+
-       *)
-         $echo "$modename: unknown library version type \`$version_type'" 1>&2
-         echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
---- ltconfig.orig	Wed Sep 23 23:37:18 1998
-+++ ltconfig	Wed Sep 23 23:39:06 1998
-@@ -1123,10 +1123,21 @@
+--- ltconfig.orig	Fri Mar 20 17:00:29 1998
++++ ltconfig	Sat Dec 12 09:11:40 1998
+@@ -1123,10 +1123,11 @@
    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
    ;;
  
 -freebsd2* | freebsd3*)
-+freebsd2*)
-   version_type=sunos
+-  version_type=sunos
++freebsd2*|freebsd3*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
    library_names_spec='${libname}${release}.so.$versuffix $libname.so'
-   finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+freebsd3*)
-+  version_type=freebsd
-+  library_names_spec='${libname}${release}.so.$versuffix $libname.so'
-+  if [ $PORTOBJFORMAT = elf ]; then
-+  finish_cmds='PATH="$PATH:/sbin" OBJFORMAT="$PORTOBJFORMAT" ldconfig -m $libdir'
-+  else
-+  finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
-+  fi
+-  finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
++  finish_cmds='PATH="$PATH:/sbin" OBJFORMAT="$objformat" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
    ;;
  
diff -urN /usr/ports/devel/libtool/patches/patch-ad libtool/patches/patch-ad
--- /usr/ports/devel/libtool/patches/patch-ad	Thu Jan  1 09:00:00 1970
+++ libtool/patches/patch-ad	Sat Dec 12 09:13:51 1998
@@ -0,0 +1,21 @@
+--- ltmain.sh.orig	Fri Mar 20 17:00:29 1998
++++ ltmain.sh	Sat Dec 12 09:13:28 1998
+@@ -967,6 +967,18 @@
+         versuffix="$current.$revision"
+         ;;
+ 
++      freebsd-aout)
++        version_vars="$version_vars major versuffix"
++        major="$current"
++        versuffix="$current.$revision";
++        ;;
++
++      freebsd-elf)
++        version_vars="$version_vars major versuffix"
++        major="$current"
++        versuffix="$current";
++        ;;
++
+       *)
+         $echo "$modename: unknown library version type \`$version_type'" 1>&2
+         echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2

>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19981214123941G.shige>