From eda31e542908fe3ccf9ad58a51cd8a0f3baf69ef Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 4 Feb 2010 00:57:19 +0100 Subject: rename package directory --- package/gnupg/Makefile | 45 ++++++++++++++++++++ package/gnupg/patches/patch-mpi_longlong_h | 67 ++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+) create mode 100644 package/gnupg/Makefile create mode 100644 package/gnupg/patches/patch-mpi_longlong_h (limited to 'package/gnupg') diff --git a/package/gnupg/Makefile b/package/gnupg/Makefile new file mode 100644 index 000000000..0a14439f5 --- /dev/null +++ b/package/gnupg/Makefile @@ -0,0 +1,45 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include ${TOPDIR}/rules.mk + +PKG_NAME:= gnupg +PKG_VERSION:= 1.4.10 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 991faf66d3352ac1452acc393c430b23 +PKG_DESCR:= Gnu Privacy Guard +PKG_SECTION:= text +PKG_DEPENDS:= libreadline libiconv +PKG_BUILDDEP+= readline libiconv +PKG_URL:= http://www.gnupg.org +PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/gnupg/ + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,GNUPG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_STYLE:= gnu +CONFIGURE_ENV+= ac_cv_c_bigendian=no \ + ac_cv_sizeof_off_t=8 +CONFIGURE_ARGS+= --disable-asm \ + --disable-gnupg-iconv \ + --disable-card-support \ + --disable-agent-support \ + --disable-bzip2 \ + --disable-exec \ + --disable-ldap \ + --disable-hkp \ + --disable-finger \ + --disable-ftp \ + --disable-dns-srv \ + --enable-fake-curl \ + --disable-regex +BUILD_STYLE:= auto + +do-install: + ${INSTALL_DIR} ${IDIR_GNUPG}/usr/bin/ + ${INSTALL_BIN} ${WRKBUILD}/g10/gpg ${IDIR_GNUPG}/usr/bin/ +# we need root privileges for secure memory (locked pages) + chmod u+s ${IDIR_GNUPG}/usr/bin/gpg + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gnupg/patches/patch-mpi_longlong_h b/package/gnupg/patches/patch-mpi_longlong_h new file mode 100644 index 000000000..85fc65552 --- /dev/null +++ b/package/gnupg/patches/patch-mpi_longlong_h @@ -0,0 +1,67 @@ +--- gnupg-1.4.9.orig/mpi/longlong.h 2007-10-23 11:15:14.000000000 +0200 ++++ gnupg-1.4.9/mpi/longlong.h 2009-06-19 19:16:25.000000000 +0200 +@@ -706,18 +706,35 @@ extern USItype __udiv_qrnnd (); + #endif /* __m88110__ */ + #endif /* __m88000__ */ + ++/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */ ++#if defined (__GNUC__) && defined (__GNUC_MINOR__) ++#define __GNUC_PREREQ(maj, min) \ ++ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) ++#else ++#define __GNUC_PREREQ(maj, min) 0 ++#endif ++ + /*************************************** + ************** MIPS ***************** + ***************************************/ + #if defined (__mips__) && W_TYPE_SIZE == 32 +-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 ++#if __GNUC_PREREQ (4,4) ++#define umul_ppmm(w1, w0, u, v) \ ++ do { \ ++ UDItype __ll = (UDItype)(u) * (v); \ ++ w1 = __ll >> 32; \ ++ w0 = __ll; \ ++ } while (0) ++#endif ++#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7) + #define umul_ppmm(w1, w0, u, v) \ + __asm__ ("multu %2,%3" \ + : "=l" ((USItype)(w0)), \ + "=h" ((USItype)(w1)) \ + : "d" ((USItype)(u)), \ + "d" ((USItype)(v))) +-#else ++#endif ++#if !defined (umul_ppmm) + #define umul_ppmm(w1, w0, u, v) \ + __asm__ ("multu %2,%3 \n" \ + "mflo %0 \n" \ +@@ -735,14 +752,24 @@ extern USItype __udiv_qrnnd (); + ************** MIPS/64 ************** + ***************************************/ + #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 +-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 ++#if __GNUC_PREREQ (4,4) ++#define umul_ppmm(w1, w0, u, v) \ ++ do { \ ++ typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \ ++ __ll_UTItype __ll = (__ll_UTItype)(u) * (v); \ ++ w1 = __ll >> 64; \ ++ w0 = __ll; \ ++ } while (0) ++#endif ++#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7) + #define umul_ppmm(w1, w0, u, v) \ + __asm__ ("dmultu %2,%3" \ + : "=l" ((UDItype)(w0)), \ + "=h" ((UDItype)(w1)) \ + : "d" ((UDItype)(u)), \ + "d" ((UDItype)(v))) +-#else ++#endif ++#if !defined (umul_ppmm) + #define umul_ppmm(w1, w0, u, v) \ + __asm__ ("dmultu %2,%3 \n" \ + "mflo %0 \n" \ -- cgit v1.2.3 From 6daa792eab1488d013fefc5eb7e4d01f40f38687 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 7 Feb 2010 20:03:20 +0100 Subject: change defaults for CONFIG/BUILD/INSTALL styles All packages need an update, so here is a very huge commit. Most of the 460 source packages use automatic style for configuration, building and installing. Make these styles default to "auto". If you have a package, which does not conform to this, just use manual style and add a do-$task make target. I added a new style named AUTOTOOL style, which is needed for some broken packages, which needs to be updated via autoconf or automake. I renamed CONFIGURE_STYLE to CONFIG_STYLE. Updates for some packages, which have newer upstream versions. Renaming of all package/*/extra directories. Use the directory src/ to provide overwrites of source files or to add the code, when no upstream package is available or used. src directory will be automatically used. --- package/gnupg/Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'package/gnupg') diff --git a/package/gnupg/Makefile b/package/gnupg/Makefile index 0a14439f5..950b1ffbe 100644 --- a/package/gnupg/Makefile +++ b/package/gnupg/Makefile @@ -18,9 +18,6 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,GNUPG,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -CONFIGURE_STYLE:= gnu -CONFIGURE_ENV+= ac_cv_c_bigendian=no \ - ac_cv_sizeof_off_t=8 CONFIGURE_ARGS+= --disable-asm \ --disable-gnupg-iconv \ --disable-card-support \ @@ -34,11 +31,13 @@ CONFIGURE_ARGS+= --disable-asm \ --disable-dns-srv \ --enable-fake-curl \ --disable-regex -BUILD_STYLE:= auto -do-install: +post-install: ${INSTALL_DIR} ${IDIR_GNUPG}/usr/bin/ - ${INSTALL_BIN} ${WRKBUILD}/g10/gpg ${IDIR_GNUPG}/usr/bin/ + ${INSTALL_DIR} ${IDIR_GNUPG}/usr/share/gnupg + ${INSTALL_DATA} ${WRKINST}/usr/share/gnupg/options.skel \ + ${IDIR_GNUPG}/usr/share/gnupg + ${INSTALL_BIN} ${WRKINST}/usr/bin/gpg ${IDIR_GNUPG}/usr/bin/ # we need root privileges for secure memory (locked pages) chmod u+s ${IDIR_GNUPG}/usr/bin/gpg -- cgit v1.2.3