Mail Archives: cygwin/2008/05/04/16:53:04
--------------030303080809050202020801
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Eric Blake wrote:
| I've reported this before against earlier versions [1], but the bug is
| still present in 0.3.9, and it breaks packaging of bash. Basically,
| cygport should NOT ignore patches to aclocal.m4 in packages that do not
| use automake, since in that case, it is a hand-maintained file and not
| generated.
I'm sorry that I missed this before.
It's slightly more complicated than that, but here's a patch that should
handle most cases. There are a handful of packages where the autotools
are listed in a subdirectory (tcl comes to mind), but such a case would
anyways require a DIFF_EXCLUDES. I want to test this further to see if
any regressions arise before committing.
WRT your bash cygport, it would appear that you have rendered the
aclocal patch unnecessary by setting the AC_CACHE_VAL.
As for your other "hacks":
1) I would investigate further a bug (in soelim?) that prevents ".so"
from reading a compressed file unless it is on the first line.
FWIW, on Gentoo, the offending section is removed entirely from
bash_builtins.1, but on Debian it is present and bash.1 is compressed.
sourceware also has a compressed bash.1, and builtins.1 (and all those
which .so it) works fine.
2) Parallel make should be possible with a patch from Gentoo:
http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/app-shells/bash/files/bash-3.2-parallel-build.patch
3) With the postinstall, perhaps you could rename it and installing it
manually, e.g.:
insinto /etc/postinstall
newins 00postinstall.sh 00bash.sh
You would then have two postinstall scripts (bash.sh containing the
install-info command), *or* you could RESTRICT="postinst-info" as info
might not be set up (e.g. update-info-dir) on a fresh install.
Yaakov
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iEYEAREIAAYFAkgeIiIACgkQpiWmPGlmQSM59ACeNmSJDcU15jrC4NZOvyNyD+ti
p1QAoOU+t0EZQlSYZLhtU9EbtxBvj26k
=nIVI
-----END PGP SIGNATURE-----
--------------030303080809050202020801
Content-Type: text/plain;
name="aclocal.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="aclocal.patch"
Index: bin/cygport.in
===================================================================
RCS file: /cvsroot/cygwin-ports/cygport/bin/cygport.in,v
retrieving revision 1.109
diff -u -r1.109 cygport.in
--- bin/cygport.in 4 May 2008 06:51:03 -0000 1.109
+++ bin/cygport.in 4 May 2008 19:33:16 -0000
@@ -1754,7 +1770,7 @@
local difflevel;
local exclude;
- default_excludes="CYGWIN-PATCHES aclocal.m4* autom4te.cache \
+ default_excludes="CYGWIN-PATCHES aclocal.m4~ aclocal.m4t autom4te.cache \
config.cache config.log config.status config.h config.h.in
ABOUT-NLS Makefile.in.in Makevars.template *SlackBuild* *.egg-info \
*.class *.pyc *.mo *.gmo *.orig *.rej *.spec *.temp *~ *.stackdump";
@@ -1773,6 +1789,15 @@
*) default_excludes+=" config.rpath" ;;
esac
+ # exclude aclocal.m4 if generated from aclocal
+ if [ -f ${S}/aclocal.m4 ]
+ then
+ if $(head -n 1 ${S}/aclocal.m4 | grep -q 'generated.* by aclocal')
+ then
+ default_excludes+=" aclocal.m4";
+ fi
+ fi
+
# exclude Makefile.in only if using automake
for mf in Makefile GNUmakefile makefile
do
Index: lib/berkdb.cygclass
===================================================================
RCS file: /cvsroot/cygwin-ports/cygport/lib/berkdb.cygclass,v
retrieving revision 1.10
diff -u -r1.10 berkdb.cygclass
--- lib/berkdb.cygclass 16 Apr 2008 00:16:56 -0000 1.10
+++ lib/berkdb.cygclass 4 May 2008 19:33:16 -0000
@@ -53,7 +53,7 @@
PKG_CONTENTS[3]="etc/p*/java-${PN}.sh usr/bin/cygdb_java-${SLOT}.dll ${JAVA_DIR#/}"
PKG_CONTENTS[4]="${TCL_LIBDIR#/}"
-DIFF_EXCLUDES="configure config.hin db.jar libtool.ac lt*.ac"
+DIFF_EXCLUDES="aclocal.m4 configure config.hin db.jar libtool.ac lt*.ac"
# At a minimum, the following must be changed:
# * chmod +w dist/Makefile.in dist/aclocal/tcl.ac dist/configure.ac
--------------030303080809050202020801
Content-Type: text/plain; charset=us-ascii
--
Unsubscribe info: http://cygwin.com/ml/#unsubscribe-simple
Problem reports: http://cygwin.com/problems.html
Documentation: http://cygwin.com/docs.html
FAQ: http://cygwin.com/faq/
--------------030303080809050202020801--
- Raw text -