This is the mail archive of the
cygwin-apps
mailing list for the Cygwin project.
Re: [ITP] xdelta
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Yaakov S (Cygwin Ports) wrote:
> Try the attached cygport file and patch. You'll need to fill in
> PKG_HINTS, make the corresponding .hint's, and I won't be too offended
> if you don't like my choice of dividing the packages. :-) Depending on
> your autotools configuration, you may need to change the WANT_AUTOCONF
> line as well in order to force use of autoconf-2.5x.
Sorry, try these instead.
Yaakov
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.1 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFErcFTpiWmPGlmQSMRAtvSAJ9o8VgAB/iCDa0ibEfZVtfAC597dgCg92sN
OxXndqzCT9Yi29blWmnK/Q8=
=Khwd
-----END PGP SIGNATURE-----
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x autom4te.cache -x '*compile' -x 'intltool*.in' -x 'xml-i18n-*.in' -x '*.pyc' -x '*.mo' -x '*.gmo' -x ABOUT-NLS -x Makevars.template -x COPYING -x INSTALL -x '*.orig' -x '*.rej' -x '*~' -x '*.temp' -x texinfo.tex -x ylwrap -x 'Makefile.in*' -x configure -x gnome-doc-utils.make -x intltool.m4 -x omf.make -x xmldocs.make origsrc/xdelta-1.1.3/Makefile.am src/xdelta-1.1.3/Makefile.am
--- origsrc/xdelta-1.1.3/Makefile.am 2001-06-24 02:30:28.000000000 -0500
+++ src/xdelta-1.1.3/Makefile.am 2006-07-06 19:34:45.187500000 -0500
@@ -7,7 +7,7 @@
xdelta_SOURCES = xdmain.c getopt.c getopt1.c
xdelta_LDADD = libxdelta.la \
- $(top_srcdir)/libedsio/libedsio.la \
+ libedsio/libedsio.la \
$(GLIB_LIBS) \
-lz
@@ -17,7 +17,7 @@
lib_LTLIBRARIES = libxdelta.la
libxdelta_la_SOURCES = xdelta.c xdapply.c $(SER_SOURCES)
-libxdelta_la_LIBADD = $(GLIB_LIBS)
+libxdelta_la_LIBADD = libedsio/libedsio.la $(GLIB_LIBS)
EXTRA_DIST = xd.ser $(SER_OUT) xdelta.magic xdelta.prj xdelta.m4 \
autogen.sh xdelta.dsp xdelta.dsw stamp-ser xdrsync.c
@@ -28,7 +28,7 @@
m4data_DATA = xdelta.m4
## $Format: "libxdelta_la_LDFLAGS = -version-info $LibCurrent$:$LibRevision$:$LibAge$" $
-libxdelta_la_LDFLAGS = -version-info 2:0:0
+libxdelta_la_LDFLAGS = -version-info 2:0:0 -no-undefined
#
# Rules for the generated code
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x autom4te.cache -x '*compile' -x 'intltool*.in' -x 'xml-i18n-*.in' -x '*.pyc' -x '*.mo' -x '*.gmo' -x ABOUT-NLS -x Makevars.template -x COPYING -x INSTALL -x '*.orig' -x '*.rej' -x '*~' -x '*.temp' -x texinfo.tex -x ylwrap -x 'Makefile.in*' -x configure -x gnome-doc-utils.make -x intltool.m4 -x omf.make -x xmldocs.make origsrc/xdelta-1.1.3/configure.in src/xdelta-1.1.3/configure.in
--- origsrc/xdelta-1.1.3/configure.in 2001-09-24 01:59:17.000000000 -0500
+++ src/xdelta-1.1.3/configure.in 2006-07-06 19:23:07.109375000 -0500
@@ -75,9 +75,9 @@
AC_MSG_ERROR(Test for GLIB failed. Download it from ftp://ftp.gtk.org/pub/gtk/v1.2/))
AC_CHECK_LIB(z, gzsetparams,
- AC_CHECK_HEADER(zlib.h,,
- AC_MSG_ERROR(ZLIB headers not found)),
- AC_MSG_ERROR(ZLIB library not found))
+ [AC_CHECK_HEADER(zlib.h, [],
+ [AC_MSG_ERROR(ZLIB headers not found)])],
+ [AC_MSG_ERROR(ZLIB library not found)])
AC_OUTPUT(Makefile
doc/Makefile
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x autom4te.cache -x '*compile' -x 'intltool*.in' -x 'xml-i18n-*.in' -x '*.pyc' -x '*.mo' -x '*.gmo' -x ABOUT-NLS -x Makevars.template -x COPYING -x INSTALL -x '*.orig' -x '*.rej' -x '*~' -x '*.temp' -x texinfo.tex -x ylwrap -x 'Makefile.in*' -x configure -x gnome-doc-utils.make -x intltool.m4 -x omf.make -x xmldocs.make origsrc/xdelta-1.1.3/libedsio/Makefile.am src/xdelta-1.1.3/libedsio/Makefile.am
--- origsrc/xdelta-1.1.3/libedsio/Makefile.am 2001-06-24 02:44:27.000000000 -0500
+++ src/xdelta-1.1.3/libedsio/Makefile.am 2006-07-06 18:29:44.609375000 -0500
@@ -15,6 +15,8 @@
include_HEADERS = edsio.h edsio_edsio.h
+libedsio_la_LDFLAGS = -no-undefined
+
libedsio_la_LIBADD = $(GLIB_LIBS)
libedsio_la_SOURCES = \
diff -urN -x CYGWIN-PATCHES -x 'aclocal.m4*' -x ltmain.sh -x 'config.*' -x depcomp -x install-sh -x missing -x mkinstalldirs -x autom4te.cache -x '*compile' -x 'intltool*.in' -x 'xml-i18n-*.in' -x '*.pyc' -x '*.mo' -x '*.gmo' -x ABOUT-NLS -x Makevars.template -x COPYING -x INSTALL -x '*.orig' -x '*.rej' -x '*~' -x '*.temp' -x texinfo.tex -x ylwrap -x 'Makefile.in*' -x configure -x gnome-doc-utils.make -x intltool.m4 -x omf.make -x xmldocs.make origsrc/xdelta-1.1.3/test/Makefile.am src/xdelta-1.1.3/test/Makefile.am
--- origsrc/xdelta-1.1.3/test/Makefile.am 2001-06-24 02:44:10.000000000 -0500
+++ src/xdelta-1.1.3/test/Makefile.am 2006-07-06 19:37:10.500000000 -0500
@@ -1,13 +1,13 @@
EXTRA_DIST = xdeltatest.c README.test
-INCLUDES = -I$(top_srcdir)/libedsio $(GLIB_CFLAGS)
+INCLUDES = -I$(top_srcdir)/libedsio -I$(top_srcdir) $(GLIB_CFLAGS)
noinst_PROGRAMS = xdeltatest
xdeltatest_SOURCES = xdeltatest.c
-xdeltatest_LDADD = $(top_srcdir)/libxdelta.la \
- $(top_srcdir)/libedsio/libedsio.la \
+xdeltatest_LDADD = $(top_builddir)/libxdelta.la \
+ $(top_builddir)/libedsio/libedsio.la \
-lz \
$(GLIB_LIBS)
# xdelta.cygport - directions for packaging xdelta for cygwin
# Copyright (C) 2006 Eric Blake
# This file is free software; I give unlimited permission to copy and/or
# distribute it, with or without modifications, as long as this notice is
# preserved.
DESCRIPTION="Computes changes between binary files."
HOMEPAGE=http://sourceforge.net/projects/$PN
SRC_URI=http://prdownloads.sourceforge.net/$PN/$P.tar.gz
WANT_AUTOCONF=2.5
PKG_NAMES="${PN} libedsio0 libxdelta2 ${PN}-devel"
PKG_HINTS=""
PKG_CONTENTS[0]="usr/bin/xdelta.exe usr/share/doc/ usr/share/man/"
PKG_CONTENTS[1]="usr/bin/cygedsio-*.dll"
PKG_CONTENTS[2]="usr/bin/cygxdelta-*.dll"
PKG_CONTENTS[3]="usr/bin/xdelta-config usr/include/ usr/lib/ usr/share/aclocal/"
# Local Variables:
# fill-column: 72
# mode: sh
# sh-indentation: 2
# End: