Hi, Please find below the patch between versions 2.0.1-2 and 2.0.1-2.1 of the pth package.
Bye, Aurelien -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian GNU/Linux developer | Electrical Engineer `. `' [EMAIL PROTECTED] | [EMAIL PROTECTED] `- people.debian.org/~aurel32 | www.aurel32.net
diff -u pth-2.0.1/debian/rules pth-2.0.1/debian/rules --- pth-2.0.1/debian/rules +++ pth-2.0.1/debian/rules @@ -9,16 +9,7 @@ DEB_BUILD_GNU_CPU := $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU) DEB_BUILD_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM) DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -ifeq ($(DEB_BUILD_GNU_SYSTEM),netbsd-elf-gnu) - CONFIGURE_PTHREAD := --enable-pthread -endif -ifeq ($(DEB_BUILD_GNU_SYSTEM),knetbsd-gnu) - CONFIGURE_PTHREAD := --enable-pthread -endif -ifeq ($(DEB_BUILD_GNU_SYSTEM),kfreebsd-gnu) - CONFIGURE_PTHREAD := --enable-pthread -endif +DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) ifeq ($(CONFIGURE_PTHREAD),) pthread_arch = none @@ -26,7 +17,11 @@ pthread_arch = $(DEB_BUILD_ARCH) endif +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) export CONFIGURE_PARAMS=--prefix=/usr --mandir='\$${prefix}/share/man' --infodir='\$${prefix}/share/info' ${CONFIGURE_PTHREAD} +else +export CONFIGURE_PARAMS=--prefix=/usr --mandir='\$${prefix}/share/man' --infodir='\$${prefix}/share/info' ${CONFIGURE_PTHREAD} --host $(DEB_HOST_GNU_TYPE) +endif export LIBPTH-DBG_DIR=libpth-dbg export LIBPTH-PROF_DIR=libpth-prof @@ -37,7 +32,9 @@ cd default; ../configure ${CONFIGURE_PARAMS} cd dbg; ../configure ${CONFIGURE_PARAMS} --libdir='\$${prefix}/lib/debug' --disable-static --enable-debug cd profile; ../configure ${CONFIGURE_PARAMS} --enable-prof +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) for i in default dbg profile ; do cp /usr/bin/libtool $$i/ ; done +endif touch configure-stamp build: configure-stamp diff -u pth-2.0.1/debian/changelog pth-2.0.1/debian/changelog --- pth-2.0.1/debian/changelog +++ pth-2.0.1/debian/changelog @@ -1,3 +1,12 @@ +pth (2.0.1-2.1) unstable; urgency=low + + * NMU. + * Don't enable libpthread2 on k*bsd (closes: bug#312124). + * Fixed pth.m4 (closes: bug#305290). + * Fixed cross build (closes: bug#285408). + + -- Aurelien Jarno <[EMAIL PROTECTED]> Wed, 6 Jul 2005 23:36:30 +0200 + pth (2.0.1-2) unstable; urgency=high * Bumped Standards-Version to 3.6.1. No changes required. only in patch2: unchanged: --- pth-2.0.1.orig/pth.m4 +++ pth-2.0.1/pth.m4 @@ -40,7 +40,7 @@ dnl ## dnl dnl # auxilliary macros -AC_DEFUN(_AC_PTH_ERROR, [dnl +AC_DEFUN([_AC_PTH_ERROR], [dnl AC_MSG_RESULT([*FAILED*]) define(_ac_pth_line,dnl "+------------------------------------------------------------------------+") @@ -52,13 +52,13 @@ undefine(_ac_pth_line) exit 1 ]) -AC_DEFUN(_AC_PTH_VERBOSE, [dnl +AC_DEFUN([_AC_PTH_VERBOSE], [dnl if test ".$verbose" = .yes; then AC_MSG_RESULT([ $1]) fi ]) dnl # the user macro -AC_DEFUN(AC_CHECK_PTH, [dnl +AC_DEFUN([AC_CHECK_PTH], [dnl dnl dnl # prerequisites AC_REQUIRE([AC_PROG_CC])dnl