Mail Archives: cygwin/2003/05/25/07:27:38
------=_NextPart_000_00B4_01C322B8.F9652C70
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Success! Some of my 'fixes' are horibble kludges, but there is ample
material here to discuss.
Some notes:
Upgrading the autotools in db requires an "ed":
-------------- ed -------------------
#!/bin/sh
ex "$@"
-------------------------------------
I needed to modify autoreconf to make it suitable - patch attached to create
a myautoreconf.
Some parts of rpm AC_PREREQ(2.12). Hence, you *must* *must* source the
following before building:
--------------- autodevel --------------------------------
AUTO_DEVEL=${AUTO_DEVEL:-/usr/autotool/devel}
export PATH=${AUTO_DEVEL}/bin:${PATH}
export M4PATH=${AUTO_DEVEL}/share/autoconf:${M4PATH}
----------------------------------------------------------
If you get a weird error whilst making popt, check config.h.in - if it is
mostly empty, you have forgotten to do this.
I haven't had time to describe the reasons for all my changes - hopefully
most will be self-evident, but if not, just ask.
Max.
------=_NextPart_000_00B4_01C322B8.F9652C70
Content-Type: application/octet-stream;
name="fixup-rpm-4.2-auto.sh"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="fixup-rpm-4.2-auto.sh"
#!/bin/bash=0A=
=0A=
# NB: You need an "ed" to run s_config. A simple wrapper on "ex" will =
suffice.=0A=
=0A=
# We exclude the elfutils directory to influence the configure process.=0A=
# We exclude db/docs because it takes so long to unpack, and is unneeded =
to build.=0A=
# We exclude a load of junk packaged in db/build_unix in the rpm-4.2 =
tarball.=0A=
=0A=
# FIXME: Fix the one remaining $(DESTDIR)/ in ./Makefile*=0A=
=0A=
set -e=0A=
=0A=
PKG=3Drpm=0A=
VER=3D4.2=0A=
REL=3D=0A=
TARBALL=3D"/m/max/sources/${PKG}-${VER}${REL}.tar.bz2"=0A=
=0A=
if [ ! -f rpm.c ]; then=0A=
if [ ! -d "$PKG-$VER" ]; then=0A=
echo Unpacking "${PKG}-${VER}${REL}"...=0A=
tar \=0A=
--exclude=3D'*/db/docs' \=0A=
--exclude=3D'*/db/build_unix/.libs' \=0A=
--exclude=3D'*/db/build_unix/*.lo' \=0A=
--exclude=3D'*/db/build_unix/*.o' \=0A=
--exclude=3D'*/db/build_unix/*.h' \=0A=
--exclude=3D'*/db/build_unix/*.la' \=0A=
--exclude=3D'*/db/build_unix/*.log' \=0A=
--exclude=3D'*/db/build_unix/db_*' \=0A=
--exclude=3D'*/db/build_unix/libtool' \=0A=
--exclude=3D'*/db/build_unix/Makefile' \=0A=
--exclude=3D'*/db/build_unix/config.status' \=0A=
--exclude=3D'*/db/build_unix/include.tcl' \=0A=
--exclude=3D'*/elfutils' \=0A=
-jxvf "$TARBALL"=0A=
fi=0A=
cd "$PKG-$VER"=0A=
fi=0A=
=0A=
patch -p1 -b -i ../rpm-4.2-auto-fixups.patch=0A=
=0A=
echo=0A=
AUTO_DEVEL=3D${AUTO_DEVEL:-/usr/autotool/devel}=0A=
export PATH=3D${AUTO_DEVEL}/bin:${PATH}=0A=
export M4PATH=3D${AUTO_DEVEL}/share/autoconf:${M4PATH}=0A=
=0A=
# OK, this is a workaround for a truly obscure problem:=0A=
# libtoolize will act like AC_CONFIG_AUX_DIR(..) if there is an =
install-sh in =0A=
# "..", but not in "." - so, we create one. The autoreconfiscation will =
fill in=0A=
# a real one in just a moment.=0A=
touch popt/install-sh=0A=
=0A=
for i in popt beecrypt zlib file .; do=0A=
(=0A=
echo "Autoreconfing in $i... "=0A=
cd "$i"=0A=
myautoreconf -fivl=0A=
echo -n "Libtool is: "=0A=
grep -E "^VERSION=3D" ltmain.sh=0A=
echo=0A=
)=0A=
done=0A=
=0A=
(=0A=
echo "Doing complex autoreconf for db"=0A=
cd db/dist=0A=
cp -f "${AUTO_DEVEL}/share/aclocal/libtool.m4" aclocal/libtool.ac=0A=
libtoolize --copy --force=0A=
./s_config=0A=
)=0A=
=0A=
echo=0A=
echo '*** WARNING! WARNING! WARNING! ***'=0A=
echo 'Due to bugs in the rpm configure.ac, you MUST not use a =
config.cache'=0A=
echo 'and the build will *probably* fail unless you configure =
--without-python'=0A=
------=_NextPart_000_00B4_01C322B8.F9652C70
Content-Type: text/plain;
name="rpm-4.2-auto-fixups.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="rpm-4.2-auto-fixups.patch"
--- rpm-4.2/beecrypt/beecrypt.c.orig 2002-07-07 21:21:12.000000000 +0100=0A=
+++ rpm-4.2/beecrypt/beecrypt.c 2003-05-25 11:37:27.000000000 +0100=0A=
@@ -856,7 +856,6 @@=0A=
}=0A=
=0A=
#if WIN32=0A=
-__declspec(dllexport)=0A=
BOOL WINAPI DllMain(HINSTANCE hInst, DWORD wDataSeg, LPVOID lpReserved)=0A=
{=0A=
switch (wDataSeg)=0A=
--- rpm-4.2/beecrypt/Makefile.am.orig 2002-12-07 18:58:39.000000000 +0000=0A=
+++ rpm-4.2/beecrypt/Makefile.am 2003-05-25 11:37:27.000000000 +0100=0A=
@@ -53,9 +53,9 @@=0A=
=0A=
libbeecrypt_la_DEPENDENCIES =3D $(BEECRYPT_OBJECTS) =
$(BEECRYPT_JAVA_OBJECTS)=0A=
=0A=
-libbeecrypt_la_LIBADD =3D aesopt.lo blowfishopt.lo mp32opt.lo sha1opt.lo=0A=
+libbeecrypt_la_LIBADD =3D aesopt.lo blowfishopt.lo mp32opt.lo =
sha1opt.lo -lwinmm=0A=
=0A=
-libbeecrypt_la_LDFLAGS =3D -version-info =
$(LIBBEECRYPT_LT_CURRENT):$(LIBBEECRYPT_LT_REVISION):$(LIBBEECRYPT_LT_AGE=
)=0A=
+libbeecrypt_la_LDFLAGS =3D -version-info =
$(LIBBEECRYPT_LT_CURRENT):$(LIBBEECRYPT_LT_REVISION):$(LIBBEECRYPT_LT_AGE=
) -no-undefined=0A=
=0A=
pkginclude_HEADERS =3D aes.h base64.h beecrypt.h blockmode.h blockpad.h =
blowfish.h dhaes.h dldp.h dlkp.h dlpk.h dlsvdp-dh.h dsa.h elgamal.h =
endianness.h entropy.h fips186.h hmac.h hmacmd5.h hmacsha1.h =
hmacsha256.h md5.h memchunk.h mp32.h mp32barrett.h mp32number.h =
mp32prime.h mtprng.h rsa.h rsakp.h rsapk.h sha1.h sha256.h timestamp.h=0A=
=0A=
--- rpm-4.2/build/Makefile.am.orig 2003-03-06 21:48:37.000000000 +0000=0A=
+++ rpm-4.2/build/Makefile.am 2003-05-25 11:37:28.000000000 +0100=0A=
@@ -32,7 +32,9 @@=0A=
$(top_builddir)/lib/librpm.la \=0A=
$(top_builddir)/rpmdb/librpmdb.la \=0A=
$(top_builddir)/rpmio/librpmio.la \=0A=
+ -no-undefined \=0A=
@WITH_LIBELF_LIB@=0A=
+librpmbuild_la_LIBADD =3D $(INTLLIBS) $(top_builddir)/popt/libpopt.la=0A=
=0A=
rpmfile.h:=0A=
@ln -sf $(top_builddir)/file/file.h $@=0A=
--- rpm-4.2/configure.ac.orig 2003-02-14 22:53:37.000000000 +0000=0A=
+++ rpm-4.2/configure.ac 2003-05-25 11:37:27.000000000 +0100=0A=
@@ -7,9 +7,9 @@=0A=
AC_INIT(rpmqv.c)=0A=
AC_CANONICAL_SYSTEM=0A=
AC_PREREQ(2.12) dnl Minimum Autoconf version required.=0A=
-AC_CONFIG_HEADERS=0A=
+=0A=
AM_INIT_AUTOMAKE(rpm, 4.2)=0A=
-AM_CONFIG_HEADER(config.h)=0A=
+AC_CONFIG_HEADERS(config.h)=0A=
=0A=
dnl XXX AM_MAINTAINER_MODE=0A=
=0A=
@@ -1226,7 +1226,7 @@=0A=
dnl # XXX Propagate -lucb to popt ...=0A=
dnl export LIBS INCPATH CONFIG_SITE=0A=
=0A=
-AC_CONFIG_SUBDIRS(popt beecrypt zlib elfutils file db3)=0A=
+AC_CONFIG_SUBDIRS(popt beecrypt zlib file db3)=0A=
=0A=
AC_OUTPUT([ Doxyfile Makefile rpmrc macros platform rpmpopt rpm.spec=0A=
rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile=0A=
--- rpm-4.2/db/dist/configure.ac.orig 2002-09-20 15:02:22.000000000 +0100=0A=
+++ rpm-4.2/db/dist/configure.ac 2003-05-25 11:37:27.000000000 +0100=0A=
@@ -213,7 +213,6 @@=0A=
#=0A=
# AC_PROG_CXX sets CXX, but it uses $CXX and $CCC (in that order) as its=0A=
# first choices.=0A=
-if test "$db_cv_cxx" =3D "yes"; then=0A=
if test "$GCC" !=3D "yes"; then=0A=
case "$host_os" in=0A=
aix*) AC_CHECK_TOOL(CCC, xlC_r)=0A=
@@ -226,6 +225,12 @@=0A=
esac=0A=
fi=0A=
AC_PROG_CXX=0A=
+=0A=
+# Expanding but not running AC_PROG_CXX breaks AC_PROG_LIBTOOL=0A=
+# (at least it does with ac-2.57, lt-1.5). Hence, we have to keep the =
above=0A=
+# outside the conditional, even though it is useless the conditional is =
true.=0A=
+=0A=
+if test "$db_cv_cxx" =3D "yes"; then=0A=
AC_CXX_HAVE_STDHEADERS=0A=
MAKEFILE_CXX=3D"${CXX}"=0A=
MAKEFILE_CXXLINK=3D"${CXX}"=0A=
@@ -267,10 +272,10 @@=0A=
INSTALLER=3D"\$(LIBTOOL) --mode=3Dinstall cp -p"=0A=
=0A=
MAKEFILE_CC=3D"\$(LIBTOOL) --mode=3Dcompile ${MAKEFILE_CC}"=0A=
-MAKEFILE_SOLINK=3D"\$(LIBTOOL) --mode=3Dlink ${MAKEFILE_CCLINK} =
-avoid-version"=0A=
+MAKEFILE_SOLINK=3D"\$(LIBTOOL) --mode=3Dlink ${MAKEFILE_CCLINK} =
-avoid-version -no-undefined"=0A=
MAKEFILE_CCLINK=3D"\$(LIBTOOL) --mode=3Dlink ${MAKEFILE_CCLINK}"=0A=
MAKEFILE_CXX=3D"\$(LIBTOOL) --mode=3Dcompile ${MAKEFILE_CXX}"=0A=
-MAKEFILE_XSOLINK=3D"\$(LIBTOOL) --mode=3Dlink ${MAKEFILE_CXXLINK} =
-avoid-version"=0A=
+MAKEFILE_XSOLINK=3D"\$(LIBTOOL) --mode=3Dlink ${MAKEFILE_CXXLINK} =
-avoid-version -no-undefined"=0A=
MAKEFILE_CXXLINK=3D"\$(LIBTOOL) --mode=3Dlink ${MAKEFILE_CXXLINK}"=0A=
=0A=
# Configure for shared libraries, static libraries, or both. If both =
are=0A=
--- rpm-4.2/db3/configure.orig 2002-12-20 14:36:49.000000000 +0000=0A=
+++ rpm-4.2/db3/configure 2003-05-25 11:37:27.000000000 +0100=0A=
@@ -5,10 +5,10 @@=0A=
rm -f config.cache=0A=
=0A=
# XXX edit CFLAGS=3D ... out of invocation args ???=0A=
-ARGS=3D"`echo $* | sed -e 's% [^ ]*CFLAGS=3D[^ ]*%%' -e 's% -[^-][^ =
]*%%g' -e 's%--cache-file=3D.*$%%'`"=0A=
+ARGS=3D"`echo " $*" | sed -e 's% [^ ]*CFLAGS=3D[^ ]*%%' -e 's% -[^-][^ =
]*%%g' -e 's%--cache-file=3D.*$%%'`"=0A=
=0A=
CC=3D"$CC" CFLAGS=3D"$CFLAGS" $db_dist/configure $ARGS \=0A=
- --enable-shared --enable-static --enable-rpc \=0A=
+ --enable-shared --enable-static --disable-rpc \=0A=
--with-uniquename=3D_rpmdb --srcdir=3D$db_dist=0A=
=0A=
mv Makefile Makefile.orig=0A=
--- rpm-4.2/file/Makefile.am.orig 2003-02-13 16:57:49.000000000 +0000=0A=
+++ rpm-4.2/file/Makefile.am 2003-05-25 11:37:27.000000000 +0100=0A=
@@ -21,6 +21,7 @@=0A=
libfmagic_la_SOURCES =3D \=0A=
apprentice.c ascmagic.c fsmagic.c compress.c \=0A=
print.c readelf.c softmagic.c=0A=
+libfmagic_la_LDFLAGS =3D -no-undefined=0A=
=0A=
#bin_PROGRAMS =3D file=0A=
noinst_PROGRAMS =3D file=0A=
@@ -54,10 +55,10 @@=0A=
cat $$f; \=0A=
done >> $@=0A=
=0A=
-magic.mgc: magic file=0A=
+magic.mgc: magic file$(EXEEXT)=0A=
./file -C -m magic=0A=
=0A=
-magic.mime.mgc: magic.mime file=0A=
+magic.mime.mgc: magic.mime file$(EXEEXT)=0A=
./file -C -m $(srcdir)/magic.mime=0A=
=0A=
file.1: Makefile file.man=0A=
--- rpm-4.2/lib/Makefile.am.orig 2003-03-06 21:48:26.000000000 +0000=0A=
+++ rpm-4.2/lib/Makefile.am 2003-05-25 11:37:28.000000000 +0100=0A=
@@ -39,7 +39,8 @@=0A=
librpm_la_LDFLAGS =3D -release @VERSION@ \=0A=
$(top_builddir)/rpmdb/librpmdb.la \=0A=
$(top_builddir)/rpmio/librpmio.la \=0A=
- $(top_builddir)/popt/libpopt.la=0A=
+ $(top_builddir)/popt/libpopt.la -no-undefined=0A=
+librpm_la_LIBADD =3D $(INTLLIBS)=0A=
=0A=
getdate.c: getdate.y=0A=
@echo expect 10 shift/reduce conflicts=0A=
--- rpm-4.2/lib/signature.c.orig 2003-01-23 17:28:26.000000000 +0000=0A=
+++ rpm-4.2/lib/signature.c 2003-05-25 11:37:27.000000000 +0100=0A=
@@ -26,7 +26,7 @@=0A=
/*@access pgpDig@*/=0A=
/*@access pgpDigParams@*/=0A=
=0A=
-#if !defined(__GLIBC__)=0A=
+#if !defined(__GLIBC__) && !defined(__CYGWIN__)=0A=
char ** environ =3D NULL;=0A=
#endif=0A=
=0A=
--- rpm-4.2/popt/configure.ac.orig 2002-12-19 23:41:07.000000000 +0000=0A=
+++ rpm-4.2/popt/configure.ac 2003-05-25 11:37:27.000000000 +0100=0A=
@@ -1,9 +1,9 @@=0A=
AC_INIT(popt.h)=0A=
AC_CANONICAL_SYSTEM=0A=
AC_PREREQ(2.12)=0A=
-AC_CONFIG_HEADERS=0A=
+=0A=
AM_INIT_AUTOMAKE(popt, 1.8)=0A=
-AM_CONFIG_HEADER(config.h)=0A=
+AC_CONFIG_HEADERS(config.h)=0A=
=0A=
ALL_LINGUAS=3D"cs da de es eu_ES fi fr gl hu id is it ja ko no pl pt =
pt_BR ro ru sk sl sr sv tr uk wa zh zh_CN.GB2312"=0A=
=0A=
--- rpm-4.2/popt/Makefile.am.orig 2002-12-01 19:02:30.000000000 +0000=0A=
+++ rpm-4.2/popt/Makefile.am 2003-05-25 11:37:27.000000000 +0100=0A=
@@ -38,6 +38,8 @@=0A=
usrlibdir =3D $(libdir)@MARK64@=0A=
usrlib_LTLIBRARIES =3D libpopt.la=0A=
libpopt_la_SOURCES =3D popt.c findme.c poptparse.c poptconfig.c =
popthelp.c=0A=
+libpopt_la_LIBADD =3D $(INTLLIBS)=0A=
+libpopt_la_LDFLAGS =3D -no-undefined=0A=
=0A=
man_MANS =3D popt.3=0A=
=0A=
--- rpm-4.2/rpmdb/Makefile.am.orig 2003-03-06 21:59:16.000000000 +0000=0A=
+++ rpm-4.2/rpmdb/Makefile.am 2003-05-25 11:37:28.000000000 +0100=0A=
@@ -27,7 +27,7 @@=0A=
=0A=
pkgbindir =3D @RPMCONFIGDIR@=0A=
pkgbin_PROGRAMS =3D \=0A=
- rpmdb_deadlock rpmdb_dump rpmdb_load rpmdb_svc rpmdb_stat rpmdb_verify=0A=
+ rpmdb_deadlock rpmdb_dump rpmdb_load rpmdb_stat rpmdb_verify=0A=
noinst_PROGRAMS =3D \=0A=
rpmdb_archive rpmdb_checkpoint rpmdb_printlog rpmdb_recover \=0A=
rpmdb_upgrade=0A=
@@ -50,9 +50,10 @@=0A=
librpmdb_la_LDFLAGS =3D -release @VERSION@ \=0A=
$(top_builddir)/rpmio/librpmio.la \=0A=
$(top_builddir)/popt/libpopt.la \=0A=
+ -no-undefined \=0A=
@WITH_LIBELF_LIB@ \=0A=
@libdb3@=0A=
-librpmdb_la_LIBADD =3D $(DBLIBOBJS) $(DB3LOBJS)=0A=
+librpmdb_la_LIBADD =3D $(DBLIBOBJS) $(DB3LOBJS) $(INTLLIBS)=0A=
librpmdb_la_DEPENDENCIES =3D $(DBLIBOBJS) .created=0A=
=0A=
# XXX make sure that db.h symlink is generated=0A=
@@ -83,6 +84,10 @@=0A=
for lo in $(DB3LOBJS); do \=0A=
[ -f $$lo ] || $(LN_S) $(top_builddir)/$(WITH_DB_SUBDIR)/$$lo $$lo ; =
\=0A=
done=0A=
+ for o in `echo $(DB3LOBJS) | sed 's/\.lo\>/\.o/g'`; do \=0A=
+ [ -f $$o ] || $(LN_S) $(top_builddir)/$(WITH_DB_SUBDIR)/$$o $$o ; \=0A=
+ [ -f .libs/$$o ] || $(LN_S) ../$(top_builddir)/$(WITH_DB_SUBDIR)/$$o =
.libs/$$o ; \=0A=
+ done=0A=
touch $@=0A=
=0A=
rpmdb_archive_SOURCES =3D=0A=
@@ -139,14 +144,14 @@=0A=
$(top_builddir)/$(WITH_DB_SUBDIR)/util_sig.lo \=0A=
librpmdb.la=0A=
=0A=
-rpmdb_svc_SOURCES =3D=0A=
-rpmdb_svc_LDADD =3D \=0A=
- $(top_builddir)/$(WITH_DB_SUBDIR)/db_server_proc.lo \=0A=
- $(top_builddir)/$(WITH_DB_SUBDIR)/db_server_svc.lo \=0A=
- $(top_builddir)/$(WITH_DB_SUBDIR)/db_server_util.lo \=0A=
- $(top_builddir)/$(WITH_DB_SUBDIR)/gen_db_server.lo \=0A=
- $(top_builddir)/$(WITH_DB_SUBDIR)/util_log.lo \=0A=
- librpmdb.la=0A=
+# rpmdb_svc_SOURCES =3D=0A=
+# rpmdb_svc_LDADD =3D \=0A=
+# $(top_builddir)/$(WITH_DB_SUBDIR)/db_server_proc.lo \=0A=
+# $(top_builddir)/$(WITH_DB_SUBDIR)/db_server_svc.lo \=0A=
+# $(top_builddir)/$(WITH_DB_SUBDIR)/db_server_util.lo \=0A=
+# $(top_builddir)/$(WITH_DB_SUBDIR)/gen_db_server.lo \=0A=
+# $(top_builddir)/$(WITH_DB_SUBDIR)/util_log.lo \=0A=
+# librpmdb.la=0A=
=0A=
rpmdb_upgrade_SOURCES =3D=0A=
rpmdb_upgrade_LDADD =3D \=0A=
--- rpm-4.2/rpmio/fts.c.orig 2003-01-06 17:32:46.000000000 +0000=0A=
+++ rpm-4.2/rpmio/fts.c 2003-05-25 11:37:27.000000000 +0100=0A=
@@ -59,6 +59,12 @@=0A=
# define _STAT_VER 0=0A=
# define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp))=0A=
#endif=0A=
+#if defined(__CYGWIN__)=0A=
+# define __errno_location() (&errno)=0A=
+# define stat64 stat=0A=
+# define _STAT_VER 0=0A=
+# define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp))=0A=
+#endif=0A=
#include "system.h"=0A=
#include "fts.h"=0A=
#include "rpmio.h"=0A=
--- rpm-4.2/rpmio/fts.h.orig 2003-01-06 17:32:46.000000000 +0000=0A=
+++ rpm-4.2/rpmio/fts.h 2003-05-25 11:37:27.000000000 +0100=0A=
@@ -55,6 +55,10 @@=0A=
# define _D_EXACT_NAMLEN(d) ((d)->d_reclen)=0A=
#endif=0A=
=0A=
+#if defined(__CYGWIN__)=0A=
+# define _D_EXACT_NAMLEN(d) (strlen ((d)->d_name))=0A=
+#endif=0A=
+=0A=
#endif=0A=
=0A=
#include <sys/types.h>=0A=
--- rpm-4.2/rpmio/Makefile.am.orig 2003-03-06 21:48:13.000000000 +0000=0A=
+++ rpm-4.2/rpmio/Makefile.am 2003-05-25 11:37:28.000000000 +0100=0A=
@@ -33,8 +33,11 @@=0A=
librpmio_la_LDFLAGS =3D -release @VERSION@ \=0A=
$(top_builddir)/file/libfmagic.la \=0A=
@WITH_ZLIB_LIB@ \=0A=
- -lrt -lpthread=0A=
-librpmio_la_LIBADD =3D $(BEECRYPTLOBJS)=0A=
+ -lpthread -no-undefined \=0A=
+ -Wl,--exclude-symbols=3Dgetopt \=0A=
+ -Wl,--exclude-symbols=3Dgetopt_long=0A=
+=0A=
+librpmio_la_LIBADD =3D $(BEECRYPTLOBJS) $(INTLLIBS) -lwinmm=0A=
librpmio_la_DEPENDENCIES =3D .created=0A=
=0A=
$(top_builddir)/beecrypt/listobjs:=0A=
@@ -44,6 +47,10 @@=0A=
for lo in $(BEECRYPTLOBJS); do \=0A=
[ -f $$lo ] || $(LN_S) $(top_builddir)/beecrypt/$$lo $$lo ; \=0A=
done=0A=
+ for o in `echo $(BEECRYPTLOBJS) | sed 's/\.lo\>/\.o/g'`; do \=0A=
+ [ -f $$o ] || $(LN_S) $(top_builddir)/beecrypt/$$o $$o ; \=0A=
+ [ -f .libs/$$o ] || $(LN_S) ../$(top_builddir)/beecrypt/$$o =
.libs/$$o ; \=0A=
+ done=0A=
touch $@=0A=
=0A=
clean-local:=0A=
--- rpm-4.2/rpmio/rpmio.h.orig 2002-08-13 20:43:43.000000000 +0100=0A=
+++ rpm-4.2/rpmio/rpmio.h 2003-05-25 11:37:28.000000000 +0100=0A=
@@ -10,7 +10,6 @@=0A=
#include <sys/stat.h>=0A=
#include <dirent.h>=0A=
/*@-noparams@*/=0A=
-#include <glob.h>=0A=
/*@=3Dnoparams@*/=0A=
#include <stdio.h>=0A=
#include <stdlib.h>=0A=
--- rpm-4.2/rpmio/rpmrpc.c.orig 2003-01-06 17:32:46.000000000 +0000=0A=
+++ rpm-4.2/rpmio/rpmrpc.c 2003-05-25 11:37:28.000000000 +0100=0A=
@@ -1284,6 +1284,7 @@=0A=
=0A=
/* XXX glob(3) uses REAL_DIR_ENTRY(dp) test on d_ino */=0A=
dp->d_ino =3D i + 1; /* W2DO? */=0A=
+#if !defined(__CYGWIN__)=0A=
dp->d_reclen =3D 0; /* W2DO? */=0A=
=0A=
#if !defined(hpux) && !defined(sun)=0A=
@@ -1292,6 +1293,7 @@=0A=
dp->d_type =3D dt[i];=0A=
/*@=3Dboundsread@*/=0A=
#endif=0A=
+#endif=0A=
=0A=
strncpy(dp->d_name, av[i], sizeof(dp->d_name));=0A=
/*@+voidabstract@*/=0A=
--- rpm-4.2/rpmqv.c.orig 2003-01-28 12:23:39.000000000 +0000=0A=
+++ rpm-4.2/rpmqv.c 2003-05-25 11:37:28.000000000 +0100=0A=
@@ -153,7 +153,7 @@=0A=
=0A=
/*@-bounds@*/ /* LCL: segfault */=0A=
/*@-mods@*/ /* FIX: shrug */=0A=
-#if !defined(__GLIBC__) && !defined(__LCLINT__)=0A=
+#if !defined(__GLIBC__) && !defined(__LCLINT__) && !defined(__CYGWIN__)=0A=
int main(int argc, const char ** argv, /*@unused@*/ char ** envp)=0A=
#else=0A=
int main(int argc, const char ** argv)=0A=
@@ -210,7 +210,7 @@=0A=
#endif=0A=
setprogname(argv[0]); /* Retrofit glibc __progname */=0A=
=0A=
-#if !defined(__GLIBC__) && !defined(__LCLINT__)=0A=
+#if !defined(__GLIBC__) && !defined(__LCLINT__) && !defined(__CYGWIN__)=0A=
environ =3D envp;=0A=
#endif =0A=
=0A=
--- rpm-4.2/tools/Makefile.am.orig 2003-03-07 18:21:19.000000000 +0000=0A=
+++ rpm-4.2/tools/Makefile.am 2003-05-25 11:37:28.000000000 +0100=0A=
@@ -29,15 +29,15 @@=0A=
convertdb1 dump dumpdb rpmarchive rpmheader rpmlead rpmsignature=0A=
=0A=
pkgbindir =3D @RPMCONFIGDIR@=0A=
-pkgbin_PROGRAMS =3D debugedit javadeps rpmcache rpmdeps rpmfile=0A=
+pkgbin_PROGRAMS =3D javadeps rpmcache rpmdeps rpmfile=0A=
=0A=
bin_PROGRAMS =3D rpmgraph=0A=
=0A=
convertdb1_SOURCES =3D convertdb1.c=0A=
=0A=
-debugedit_SOURCES =3D debugedit.c hashtab.c=0A=
-debugedit_LDADD =3D @LDFLAGS_STATIC@ @WITH_LIBELF_LIB@ \=0A=
- $(top_builddir)/popt/libpopt.la=0A=
+# debugedit_SOURCES =3D debugedit.c hashtab.c=0A=
+# debugedit_LDADD =3D @LDFLAGS_STATIC@ @WITH_LIBELF_LIB@ \=0A=
+# $(top_builddir)/popt/libpopt.la=0A=
=0A=
javadeps_SOURCES =3D javadeps.c=0A=
=0A=
--- rpm-4.2/zlib/configure.in.orig 2003-03-06 21:49:44.000000000 +0000=0A=
+++ rpm-4.2/zlib/configure.in 2003-05-25 11:37:28.000000000 +0100=0A=
@@ -1,8 +1,8 @@=0A=
AC_INIT(gzio.c)=0A=
AC_CANONICAL_SYSTEM=0A=
AC_PREREQ(2.12)=0A=
-AC_CONFIG_HEADERS=0A=
AM_INIT_AUTOMAKE(zlib, 1.1.4)=0A=
+AC_CONFIG_HEADERS(config.h)=0A=
=0A=
dnl Check for programs.=0A=
AC_PROG_CC=0A=
------=_NextPart_000_00B4_01C322B8.F9652C70
Content-Type: application/octet-stream;
name="myautoreconf.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="myautoreconf.diff"
--- /home/max/bin/autoreconf.current 2002-12-05 20:51:01.000000000 +0000=0A=
+++ /home/max/bin/myautoreconf 2003-05-11 22:21:44.000000000 +0100=0A=
@@ -66,6 +66,7 @@=0A=
-s, --symlink with -i, install symbolic links instead of =
copies=0A=
-m, --make when applicable, re-run ./configure && make=0A=
-W, --warnings=3DCATEGORY report the warnings falling in CATEGORY =
[syntax]=0A=
+ -l, --local local directory only (don't recurse)=0A=
=0A=
Warning categories include:=0A=
\`cross\' cross compilation issues=0A=
@@ -103,10 +104,10 @@=0A=
# Lib files.=0A=
my $autoconf =3D $ENV{'AUTOCONF'} || =
'/usr/autotool/devel/bin/autoconf';=0A=
my $autoheader =3D $ENV{'AUTOHEADER'} || =
'/usr/autotool/devel/bin/autoheader';=0A=
-my $automake =3D $ENV{'AUTOMAKE'} || 'automake';=0A=
-my $aclocal =3D $ENV{'ACLOCAL'} || 'aclocal';=0A=
-my $libtoolize =3D $ENV{'LIBTOOLIZE'} || 'libtoolize';=0A=
-my $autopoint =3D $ENV{'AUTOPOINT'} || 'autopoint';=0A=
+my $automake =3D $ENV{'AUTOMAKE'} || =
'/usr/autotool/devel/bin/automake';=0A=
+my $aclocal =3D $ENV{'ACLOCAL'} || =
'/usr/autotool/devel/bin/aclocal';=0A=
+my $libtoolize =3D $ENV{'LIBTOOLIZE'} || =
'/usr/autotool/devel/bin/libtoolize';=0A=
+my $autopoint =3D $ENV{'AUTOPOINT'} || =
'/usr/autotool/devel/bin/autopoint';=0A=
=0A=
# --install -- as --add-missing in other tools.=0A=
my $install =3D 0;=0A=
@@ -122,6 +123,9 @@=0A=
# Rerun `./configure && make'?=0A=
my $make =3D 0;=0A=
=0A=
+# Don't recurse into subdirectories=0A=
+my $local =3D 0;=0A=
+=0A=
## ---------- ##=0A=
## Routines. ##=0A=
## ---------- ##=0A=
@@ -139,7 +143,8 @@=0A=
'B|prepend-include=3Ds' =3D> \@prepend_include,=0A=
'i|install' =3D> \$install,=0A=
's|symlink' =3D> \$symlink,=0A=
- 'm|make' =3D> \$make);=0A=
+ 'm|make' =3D> \$make,=0A=
+ 'l|local' =3D> \$local);=0A=
=0A=
# Split the warnings as a list of elements instead of a list of=0A=
# lists.=0A=
@@ -381,8 +386,9 @@=0A=
{=0A=
if (-d)=0A=
{=0A=
- verbose "$configure_ac: subdirectory $_ to autoreconf";=0A=
- autoreconf ($_);=0A=
+ verbose "$configure_ac: subdirectory $_"=0A=
+ . ($local?": recursion off":" to autoreconf");=0A=
+ autoreconf ($_) unless $local;=0A=
}=0A=
else=0A=
{=0A=
@@ -391,9 +397,9 @@=0A=
}=0A=
=0A=
# Gettext consistency checks...=0A=
- error "$configure_ac: AM_GNU_GETTEXT is used, but not =
AM_GNU_GETTEXT_VERSION"=0A=
+ print STDERR "$configure_ac: AM_GNU_GETTEXT is used, but not =
AM_GNU_GETTEXT_VERSION\n"=0A=
if $uses_gettext_via_traces && ! $uses_gettext;=0A=
- error "$configure_ac: AM_GNU_GETTEXT_VERSION is used, but not =
AM_GNU_GETTEXT"=0A=
+ print STDERR "$configure_ac: AM_GNU_GETTEXT_VERSION is used, but not =
AM_GNU_GETTEXT\n"=0A=
if $uses_gettext && ! $uses_gettext_via_traces;=0A=
=0A=
=0A=
------=_NextPart_000_00B4_01C322B8.F9652C70
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/
------=_NextPart_000_00B4_01C322B8.F9652C70--
- Raw text -