Hi,
It seems the old, hacked libtool 1.5.? is no longer necessary.
As libtool 2.2.4 works out of the box passing compiler
options building up to and including ncurses with the
diffs below (tested on 32 bit and 64 bit AMD64 Solaris 10u5).
Of course libtool 2.2.4 is bound to cause other glitches,
mainly because there is free software that does not use
autotools in the latest, recommended way.
At least libtool 2.2.4 seems to work out of the box. If there
are issues, then there seems like some chance the libtool
maintainers may consider helping us. And there may be more
chance of encouraging other developers to work on KDE Solaris
if we use current, maintained tools, rather than hacked
superceded ones that are hard to understand and we are on
our own trying to maintain.
Anyway, whatever you think. I was wondering if I wanted to
consider using libtool 2.2.4, of if you just prefer the
ancient hacked one that we are on our own maintaining?
I think SunZuTech may have already fixed ncurses as well,
but I don't have those diffs.
The diffs below include the following patches:
(1) Bump libtool to 2.2.4.
(2) Bump automake to 1.10.1, which is go to with libtool 2.2.4.
(3) Bump coreutils to 6.11, probably not really necessary, could
be left out.
(4) Dude/SPECS/a52dec.pspc
libtool 2.2.4 creates lib*.a files.
(5) Dude/KBE/vim.spec
I had removed the ancient JDS gnome 2.6 that comes with
Solaris 10u5 while building JDS gnome 2.22.1 from OpenSolaris.
So this is just to allow KBE to build when gnome is not installed.
So to install these patches:
(1) pkgrm KBElibtool KBEautomake KBEcoreutils FOSSa52 FOSSncurses
(2) kbe-install
(3) cp -p /opt/kdebld/bin/libtool Dude/SPECS/Tools/libtool
i.e. replace the hacked libtool 1.5.? with the libtool 2.2.4
that was built with Dude/KBE/libtool.spec.
Thanks, Mark
Index: Dude/NCURSES/5.6/Solaris/diffs/Makefile.in.1.diff
===================================================================
--- Dude/NCURSES/5.6/Solaris/diffs/Makefile.in.1.diff (revision 1994)
+++ Dude/NCURSES/5.6/Solaris/diffs/Makefile.in.1.diff (working copy)
@@ -1,5 +1,25 @@
---- ncurses-5.6.orig/form/Makefile.in 2006-10-14 16:40:36.000000000 -0400
-+++ ncurses-5.6/form/Makefile.in 2008-05-10 22:14:35.982530000 -0400
+--- ncurses-5.6.orig/form/Makefile.in 2006-10-14 20:40:36.000000000 +0000
++++ ncurses-5.6/form/Makefile.in 2008-05-24 10:21:25.305378000 +0000
+@@ -59,8 +59,8 @@
+
+ LIBTOOL = @LIBTOOL@
+ LIBTOOL_CLEAN = @LIB_CLEAN@
+-LIBTOOL_COMPILE = @LIB_COMPILE@
+-LIBTOOL_LINK = @LIB_LINK@
++LIBTOOL_COMPILE = @LIB_COMPILE@ --tag=CC
++LIBTOOL_LINK = @LIB_LINK@ $(CC) $(CFLAGS) $(LDFLAGS)
+ LIBTOOL_INSTALL = @LIB_INSTALL@
+ LIBTOOL_UNINSTALL = @LIB_UNINSTALL@
+
+@@ -72,7 +72,7 @@
+ AR = @AR@
+ AR_OPTS = @AR_OPTS@
+ AWK = @AWK@
+-LD = @LD@
++LD = @CC@ @CFLAGS@ @LDFLAGS@
+ LN_S = @LN_S@
+
+ CC = @CC@
@@ -91,13 +91,13 @@
CFLAGS_DEFAULT = $(CFLAGS_ at DFT_UPR_MODEL@)
Index: Dude/NCURSES/5.6/Solaris/diffs/Makefile.in.3.diff
===================================================================
--- Dude/NCURSES/5.6/Solaris/diffs/Makefile.in.3.diff (revision 1994)
+++ Dude/NCURSES/5.6/Solaris/diffs/Makefile.in.3.diff (working copy)
@@ -1,5 +1,25 @@
---- ncurses-5.6.orig/menu/Makefile.in 2006-10-14 16:40:36.000000000 -0400
-+++ ncurses-5.6/menu/Makefile.in 2008-05-10 22:13:44.375885000 -0400
+--- ncurses-5.6.orig/menu/Makefile.in 2006-10-14 20:40:36.000000000 +0000
++++ ncurses-5.6/menu/Makefile.in 2008-05-24 10:10:01.356928000 +0000
+@@ -59,8 +59,8 @@
+
+ LIBTOOL = @LIBTOOL@
+ LIBTOOL_CLEAN = @LIB_CLEAN@
+-LIBTOOL_COMPILE = @LIB_COMPILE@
+-LIBTOOL_LINK = @LIB_LINK@
++LIBTOOL_COMPILE = @LIB_COMPILE@ --tag=CC
++LIBTOOL_LINK = @LIB_LINK@ $(CC) $(CFLAGS) $(LDFLAGS)
+ LIBTOOL_INSTALL = @LIB_INSTALL@
+ LIBTOOL_UNINSTALL = @LIB_UNINSTALL@
+
+@@ -72,7 +72,7 @@
+ AR = @AR@
+ AR_OPTS = @AR_OPTS@
+ AWK = @AWK@
+-LD = @LD@
++LD = @CC@ @CFLAGS@ @LDFLAGS@
+ LN_S = @LN_S@
+
+ CC = @CC@
@@ -91,13 +91,13 @@
CFLAGS_DEFAULT = $(CFLAGS_ at DFT_UPR_MODEL@)
Index: Dude/NCURSES/5.6/Solaris/diffs/Makefile.in.7.diff
===================================================================
--- Dude/NCURSES/5.6/Solaris/diffs/Makefile.in.7.diff (revision 1994)
+++ Dude/NCURSES/5.6/Solaris/diffs/Makefile.in.7.diff (working copy)
@@ -1,6 +1,22 @@
---- ncurses-5.6.orig/panel/Makefile.in 2006-10-14 16:40:36.000000000 -0400
-+++ ncurses-5.6/panel/Makefile.in 2008-05-10 22:11:26.468187000 -0400
-@@ -96,9 +96,9 @@
+--- ncurses-5.6.orig/panel/Makefile.in 2006-10-14 20:40:36.000000000 +0000
++++ ncurses-5.6/panel/Makefile.in 2008-05-24 09:58:02.973388653 +0000
+@@ -60,8 +60,8 @@
+
+ LIBTOOL = @LIBTOOL@
+ LIBTOOL_CLEAN = @LIB_CLEAN@
+-LIBTOOL_COMPILE = @LIB_COMPILE@
+-LIBTOOL_LINK = @LIB_LINK@
++LIBTOOL_COMPILE = @LIB_COMPILE@ --tag=CC
++LIBTOOL_LINK = @LIB_LINK@ $(CC) $(CFLAGS) $(LDFLAGS)
+ LIBTOOL_INSTALL = @LIB_INSTALL@
+ LIBTOOL_UNINSTALL = @LIB_UNINSTALL@
+
+@@ -92,13 +92,13 @@
+
+ CFLAGS_DEFAULT = $(CFLAGS_ at DFT_UPR_MODEL@)
+
+-LINK = $(LIBTOOL_LINK) $(CC)
++LINK = $(LIBTOOL_LINK) $(CC) $(CFLAGS) $(LDFLAGS)
LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@
SHLIB_DIRS = -L../lib
Index: Dude/SPECS/a52dec.pspc
===================================================================
--- Dude/SPECS/a52dec.pspc (revision 1994)
+++ Dude/SPECS/a52dec.pspc (working copy)
@@ -19,6 +19,7 @@
%{_bindir}/extract_a52
%dir %attr (0755, root, bin) %{_libdir}
%{_libdir}/lib*.so*
+%{_libdir}/lib*.a
%dir %attr (0755, root, bin) %{_includedir}
%{_includedir}/*
%dir %attr (0755, root, sys) %{_datadir}
@@ -32,8 +33,11 @@
%{_bindir}/%_arch64/extract_a52
%dir %attr (0755, root, bin) %{_libdir}/%_arch64
%{_libdir}/%_arch64/lib*.so*
+%{_libdir}/%_arch64/lib*.a
%endif
%changelog
+* Sat May 24 2008 - markwright at internode.on.net
+- libtool 2.2.4 also creates lib*.a files.
* Wed Nov 30 2007 - oboril.lukas at gmail.com
- Initial version
Index: Dude/KBE/vim.spec
===================================================================
--- Dude/KBE/vim.spec (revision 1994)
+++ Dude/KBE/vim.spec (working copy)
@@ -11,6 +11,7 @@
%define vim_version 71
%define SPROsslnk %(/usr/bin/pkginfo -q SPROsslnk && echo 1 || echo 0)
+%define with_gnome_libs %(pkginfo -q SUNWgnome-libs && echo 1 || echo 0)
Name: KBEvim
Group: system/kbe
@@ -23,7 +24,9 @@
SUNW_BaseDir: %{_prefix}
SUNW_Category: KBE,application
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if %with_gnome_libs
Requires: SUNWgnome-libs
+%endif
Requires: SUNWlibms
Requires: SUNWmlib
Requires: SUNWxwrtl
@@ -34,7 +37,9 @@
%if %SPROsslnk
BuildRequires: SPROsslnk
%endif
+%if %with_gnome_libs
BuildRequires: SUNWgnome-libs-devel
+%endif
BuildRequires: SUNWmlibh
@@ -70,7 +75,9 @@
--enable-multibyte \
--disable-hangulinput \
--enable-cscope \
+%if %with_gnome_libs
--enable-gui=gnome2 \
+%endif
--disable-fontset \
--enable-netbeans
Index: Dude/KBE/patch/libtool-01-bash.diff
===================================================================
--- Dude/KBE/patch/libtool-01-bash.diff (revision 0)
+++ Dude/KBE/patch/libtool-01-bash.diff (revision 0)
@@ -0,0 +1,8 @@
+--- libtool-2.2.4-orig/libtoolize.in 2008-05-02 19:28:08.000000000 +0000
++++ libtool-2.2.4/libtoolize.in 2008-05-24 02:43:38.942264847 +0000
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#! /bin/bash
+ # @configure_input@
+
+ # libtoolize (GNU @PACKAGE@@TIMESTAMP@) @VERSION@
Index: Dude/KBE/libtool.spec
===================================================================
--- Dude/KBE/libtool.spec (revision 1994)
+++ Dude/KBE/libtool.spec (working copy)
@@ -12,17 +12,18 @@
Name: KBElibtool
License: GPL
Group: system/kbe
-Version: 1.5.24
+Version: 2.2.4
Release: 1
Distribution: KDE KBE
Vendor: Sun Microsystems, Inc.
Summary: KDE KBE: GNU libtool
Source:
ftp://ftp.gnu.org/pub/gnu/libtool/libtool-%{version}.tar.gz
URL: http://www.gnu.org/
+Patch1: libtool-01-bash.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
SUNW_BaseDir: %{_prefix}
SUNW_Category: KBE,application
-SUNW_Rev: 1.0.0
+SUNW_Rev: 1.0.1
Requires: SUNWcsl
Requires: SUNWperl584core
Requires: SUNWbash
@@ -69,6 +70,8 @@
%{_includedir}/*
%changelog
+* Sat May 24 2008 - Mark Wright <markwright at internode.on.net>
+- Bump to 2.2.4. Add patch1 to use bash.
* Wed Oct 31 2007 <oboril.lukas at gmail.com>
- bump to 1.5.24
* Tue Oct 30 2007 <oboril.lukas at gmail.com>
Index: Dude/KBE/automake.spec
===================================================================
--- Dude/KBE/automake.spec (revision 1994)
+++ Dude/KBE/automake.spec (working copy)
@@ -12,7 +12,7 @@
Name: KBEautomake
License: GPL
Group: system/kbe
-Version: 1.10
+Version: 1.10.1
Release: 1
Distribution: KDE KBE
Vendor: Sun Microsystems, Inc.
@@ -23,7 +23,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
SUNW_BaseDir: %{_prefix}
SUNW_Category: KBE,application
-SUNW_Rev: 1.0.0
+SUNW_Rev: 1.0.1
Requires: SUNWcsl
Requires: SUNWperl584core
Requires: KBEm4
@@ -85,6 +85,8 @@
%{_datadir}/aclocal/*
%changelog
+* Sat May 24 2008 - Mark Wright <markwright at internode.on.net>
+- Bump to 1.10.1.
* Tue Oct 30 2007 - <oboril.lukas at gmail.com>
- adopt for KBE
* Mon Mar 26 2007 - laca at sun.com
Index: Dude/KBE/coreutils.spec
===================================================================
--- Dude/KBE/coreutils.spec (revision 1994)
+++ Dude/KBE/coreutils.spec (working copy)
@@ -10,8 +10,8 @@
Name: KBEcoreutils
Summary: KDE KBE: GNU coreutils - basic file, shell and text
manipulation utilities
-Version: 6.9
-Source:
http://ftp.gnu.org/pub/gnu/coreutils/coreutils-%{version}.tar.bz2
+Version: 6.11
+Source:
http://ftp.gnu.org/pub/gnu/coreutils/coreutils-%{version}.tar.gz
Patch1: coreutils-01-gettext.diff
SUNW_BaseDir: %{_prefix}
SUNW_Category: KBE,application
@@ -41,7 +41,7 @@
aclocal -I m4
autoupdate --force
autoheader
-automake-1.10 --force
+automake-1.10 --force --add-missing
autoconf --force
if test -f mkinstalldirs ; then /usr/bin/true ; else ( echo "#! /bin/sh" ;
echo "/usr/bin/mkdir -p \"\...@\"" ) > mkinstalldirs ; fi
chmod 755 mkinstalldirs
@@ -88,6 +88,8 @@
%changelog
+* Sat May 24 2008 - Mark Wright <markwright at internode.on.net>
+- Bump to 6.11
* Sat Nov 17 2007 - <oboril.lukas at gmail.com>
- add libiconv support
* Wed Oct 31 2007 - <oboril.lukas at gmail.com>
--
