From patchwork Sun Oct 21 15:37:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yann Diorcet X-Patchwork-Id: 193035 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [130.225.254.102]) by ozlabs.org (Postfix) with ESMTP id 68F0C2C008C for ; Mon, 22 Oct 2012 02:38:17 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 3B9163FC31 for ; Sun, 21 Oct 2012 17:38:16 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail-we0-f179.google.com (mail-we0-f179.google.com [74.125.82.179]) by hugin.dotsrc.org (Postfix) with ESMTPS id 22EA23FD5E for ; Sun, 21 Oct 2012 17:38:13 +0200 (CEST) Received: by mail-we0-f179.google.com with SMTP id z49so959240wey.10 for ; Sun, 21 Oct 2012 08:38:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=3Rm4pXvqDmHv3MD5JPf4bWiwtDLkvlxIcSBsLrmnMx4=; b=CwCpWD+PZmzuiTqvNOKPYm7lBcf3AXleLe9mOK3Wy27I1UyRZSLLeQRMW5wQKQdfxj cyV79DEO/phstGC8Epmw+6wPCVEJHaaYR+PqQFyDOzqCOh57CEwDJOv7tynEchqkjp9D ASM4Lvanb9JnfsE6wGmibJN/TCreXpmWRutnGFJ+dvzBAKaB3fDQtO3akd1ZfRh9/Qm9 KX5baLzT4KkSdTewz0zfYe2kflj9SQmPGo2+WYxUM1AP9t98T8ugCAxlAo2l/rmPIFyV PzbjCETYubFqSDloOakQ3G7wAceeVrMaDav2QgiVdxhDU0P5UulNWlbaVZqELsX5DlNE o7CQ== Received: by 10.180.95.97 with SMTP id dj1mr15425405wib.3.1350833892767; Sun, 21 Oct 2012 08:38:12 -0700 (PDT) Received: from localhost.localdomain (dom38-1-82-236-154-183.fbx.proxad.net. [82.236.154.183]) by mx.google.com with ESMTPS id gm7sm16535929wib.10.2012.10.21.08.38.11 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 21 Oct 2012 08:38:12 -0700 (PDT) From: Yann Diorcet To: dev@oe-lite.org Subject: [PATCH 10/16] bzip2: replace autotools by autotools-autoreconf and use provided autogen script Date: Sun, 21 Oct 2012 17:37:49 +0200 Message-Id: <1350833876-9499-10-git-send-email-diorcet.yann@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1350833876-9499-1-git-send-email-diorcet.yann@gmail.com> References: <1350833876-9499-1-git-send-email-diorcet.yann@gmail.com> Cc: Yann Diorcet X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Yann Diorcet Replace libtoolize by LIBTOOLIZE variable --- recipes/bzip2/bzip2-1.0.6/autoconfiscate.patch | 270 ++++++++++++------------ recipes/bzip2/bzip2.inc | 8 +- 2 files changed, 140 insertions(+), 138 deletions(-) diff --git a/recipes/bzip2/bzip2-1.0.6/autoconfiscate.patch b/recipes/bzip2/bzip2-1.0.6/autoconfiscate.patch index ad720b8..2bbf35e 100644 --- a/recipes/bzip2/bzip2-1.0.6/autoconfiscate.patch +++ b/recipes/bzip2/bzip2-1.0.6/autoconfiscate.patch @@ -1,135 +1,6 @@ -diff -urN files/autogen.sh ./autogen.sh ---- bzip2-1.0.5.orig/autogen.sh 1970-01-01 01:00:00.000000000 +0100 -+++ bzip2-1.0.5.autoconfiscated/autogen.sh 2009-11-06 12:10:43.574602171 +0100 -@@ -0,0 +1,8 @@ -+mv LICENSE COPYING -+mv CHANGES NEWS -+touch AUTHORS -+touch ChangeLog -+libtoolize --force -+aclocal -+automake --add-missing --gnu -+autoconf -diff -urN bzip2-1.0.5.orig/README.autotools bzip2-1.0.5.autoconfiscated/README.autotools ---- bzip2-1.0.5.orig/README.autotools 1970-01-01 01:00:00.000000000 +0100 -+++ bzip2-1.0.5.autoconfiscated/README.autotools 2009-11-05 23:06:27.000000000 +0100 -@@ -0,0 +1,39 @@ -+bzip2 autoconfiscated -+===================== -+ -+Temporarily at http://pack.suse.cz/sbrabec/bzip2/ expecting that it will -+become a new upstream version to prevent per-distribution shared library -+patching done by nearly each Linux vendor separately. -+ -+Autoconfiscation brings standard ./configure ; make ; make install -+installation, seamless support of DESTDIR, automatic check for supported -+CFLAGS, standard shared library support, automatic large files CFLAGS -+check and all things that are supported by automake. -+ -+It makes obsolete Makefile-libbz2_so and README.COMPILATION.PROBLEMS. -+Now configure should automatically detect correct build flags. -+ -+In case of any problem or question with autotools support feel free to -+contact me: Stanislav Brabec -+ -+Autoconfiscated version binaries are exactly equal to -+bzip2-1.0.5.tar.gz. There are only few changes. See below. -+ -+ -+New features: -+ -+Trivial link man pages for bzcat and bunzip2 added. -+ -+bzip2.pc file for pkg-config. Packages can use it for checks. -+ -+ -+Incompatible changes: -+ -+soname change. Libtool has no support for two parts name suffix (e. g. -+libbz2.so.1.0). It must be a single number (e. g. libbz2.so.1). That is -+why soname must change. But I see not a big problem with it. Several -+distributions already use the new number instead of the non-standard -+number from Makefile-libbz2_so. -+ -+To be super-safe, I incremented minor number of the library file, so -+both instances of the shared library can live together. -diff -urN bzip2-1.0.5.orig/configure.ac bzip2-1.0.5.autoconfiscated/configure.ac ---- bzip2-1.0.5.orig/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ bzip2-1.0.5.autoconfiscated/configure.ac 2009-11-06 17:04:04.000000000 +0100 -@@ -0,0 +1,70 @@ -+# -*- Autoconf -*- -+# Process this file with autoconf to produce a configure script. -+ -+AC_PREREQ([2.57]) -+AC_INIT([bzip2], [1.0.5], [Julian Seward ]) -+BZIP2_LT_CURRENT=1 -+BZIP2_LT_REVISION=5 -+BZIP2_LT_AGE=0 -+AC_CONFIG_SRCDIR([bzlib.h]) -+AC_CONFIG_MACRO_DIR([m4]) -+ -+AM_INIT_AUTOMAKE -+AM_MAINTAINER_MODE -+ -+# Checks for programs. -+AC_PROG_AWK -+AC_PROG_CC -+AC_PROG_INSTALL -+AC_PROG_LN_S -+AC_PROG_MAKE_SET -+AC_PROG_LIBTOOL -+PKG_PROG_PKG_CONFIG -+ -+# Checks for libraries. -+ -+# Checks for header files. -+ -+# Checks for typedefs, structures, and compiler characteristics. -+ -+# Check for system features. -+AC_SYS_LARGEFILE -+ -+AC_MSG_CHECKING([whether compiler understands -Wall]) -+save_CFLAGS="$CFLAGS" -+CFLAGS="$CFLAGS -Wall" -+AC_TRY_COMPILE([], [], [ -+ AC_MSG_RESULT([yes]) -+], [ -+ AC_MSG_RESULT([no]) -+ CFLAGS="$save_CFLAGS" -+]) -+ -+AC_MSG_CHECKING([whether compiler understands -Winline]) -+save_CFLAGS="$CFLAGS" -+CFLAGS="$CFLAGS -Winline" -+AC_TRY_COMPILE([], [], [ -+ AC_MSG_RESULT([yes]) -+], [ -+ AC_MSG_RESULT([no]) -+ CFLAGS="$save_CFLAGS" -+]) -+ -+AC_MSG_CHECKING([whether compiler understands -fno-strength-reduce]) -+save_CFLAGS="$CFLAGS" -+CFLAGS="$CFLAGS -fno-strength-reduce" -+AC_TRY_COMPILE([], [], [ -+ AC_MSG_RESULT([yes]) -+], [ -+ AC_MSG_RESULT([no]) -+ CFLAGS="$save_CFLAGS" -+]) -+ -+# Checks for library functions. -+ -+# Write the output. -+AC_SUBST([BZIP2_LT_CURRENT]) -+AC_SUBST([BZIP2_LT_REVISION]) -+AC_SUBST([BZIP2_LT_AGE]) -+AC_CONFIG_FILES([Makefile bzip2.pc]) -+AC_OUTPUT -diff -urN bzip2-1.0.5.orig/Makefile.am bzip2-1.0.5.autoconfiscated/Makefile.am ---- bzip2-1.0.5.orig/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ bzip2-1.0.5.autoconfiscated/Makefile.am 2009-11-05 16:45:11.000000000 +0100 +diff -urN bzip2-1.0.6/Makefile.am bzip2-1.0.6.mod/Makefile.am +--- bzip2-1.0.6/Makefile.am 1970-01-01 01:00:00.000000000 +0100 ++++ bzip2-1.0.6.mod/Makefile.am 2012-10-11 00:26:08.000000000 +0200 @@ -0,0 +1,138 @@ +lib_LTLIBRARIES = libbz2.la + @@ -269,9 +140,64 @@ diff -urN bzip2-1.0.5.orig/Makefile.am bzip2-1.0.5.autoconfiscated/Makefile.am + xmlproc.sh + +ACLOCAL_AMFLAGS = -I m4 -diff -urN bzip2-1.0.5.orig/bzip2.pc.in bzip2-1.0.5.autoconfiscated/bzip2.pc.in ---- bzip2-1.0.5.orig/bzip2.pc.in 1970-01-01 01:00:00.000000000 +0100 -+++ bzip2-1.0.5.autoconfiscated/bzip2.pc.in 2009-11-03 18:48:28.000000000 +0100 +diff -urN bzip2-1.0.6/README.autotools bzip2-1.0.6.mod/README.autotools +--- bzip2-1.0.6/README.autotools 1970-01-01 01:00:00.000000000 +0100 ++++ bzip2-1.0.6.mod/README.autotools 2012-10-11 00:26:08.000000000 +0200 +@@ -0,0 +1,39 @@ ++bzip2 autoconfiscated ++===================== ++ ++Temporarily at http://pack.suse.cz/sbrabec/bzip2/ expecting that it will ++become a new upstream version to prevent per-distribution shared library ++patching done by nearly each Linux vendor separately. ++ ++Autoconfiscation brings standard ./configure ; make ; make install ++installation, seamless support of DESTDIR, automatic check for supported ++CFLAGS, standard shared library support, automatic large files CFLAGS ++check and all things that are supported by automake. ++ ++It makes obsolete Makefile-libbz2_so and README.COMPILATION.PROBLEMS. ++Now configure should automatically detect correct build flags. ++ ++In case of any problem or question with autotools support feel free to ++contact me: Stanislav Brabec ++ ++Autoconfiscated version binaries are exactly equal to ++bzip2-1.0.5.tar.gz. There are only few changes. See below. ++ ++ ++New features: ++ ++Trivial link man pages for bzcat and bunzip2 added. ++ ++bzip2.pc file for pkg-config. Packages can use it for checks. ++ ++ ++Incompatible changes: ++ ++soname change. Libtool has no support for two parts name suffix (e. g. ++libbz2.so.1.0). It must be a single number (e. g. libbz2.so.1). That is ++why soname must change. But I see not a big problem with it. Several ++distributions already use the new number instead of the non-standard ++number from Makefile-libbz2_so. ++ ++To be super-safe, I incremented minor number of the library file, so ++both instances of the shared library can live together. +diff -urN bzip2-1.0.6/autogen.sh bzip2-1.0.6.mod/autogen.sh +--- bzip2-1.0.6/autogen.sh 1970-01-01 01:00:00.000000000 +0100 ++++ bzip2-1.0.6.mod/autogen.sh 2012-10-11 00:44:14.000000000 +0200 +@@ -0,0 +1,8 @@ ++mv LICENSE COPYING ++mv CHANGES NEWS ++touch AUTHORS ++touch ChangeLog ++$LIBTOOLIZE --force ++aclocal ++automake --add-missing --gnu ++autoreconf +diff -urN bzip2-1.0.6/bzip2.pc.in bzip2-1.0.6.mod/bzip2.pc.in +--- bzip2-1.0.6/bzip2.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ bzip2-1.0.6.mod/bzip2.pc.in 2012-10-11 00:26:08.000000000 +0200 @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ @@ -284,3 +210,77 @@ diff -urN bzip2-1.0.5.orig/bzip2.pc.in bzip2-1.0.5.autoconfiscated/bzip2.pc.in +Version: @VERSION@ +Libs: -L${libdir} -lbz2 +Cflags: -I${includedir} +diff -urN bzip2-1.0.6/configure.ac bzip2-1.0.6.mod/configure.ac +--- bzip2-1.0.6/configure.ac 1970-01-01 01:00:00.000000000 +0100 ++++ bzip2-1.0.6.mod/configure.ac 2012-10-11 00:26:08.000000000 +0200 +@@ -0,0 +1,70 @@ ++# -*- Autoconf -*- ++# Process this file with autoconf to produce a configure script. ++ ++AC_PREREQ([2.57]) ++AC_INIT([bzip2], [1.0.5], [Julian Seward ]) ++BZIP2_LT_CURRENT=1 ++BZIP2_LT_REVISION=5 ++BZIP2_LT_AGE=0 ++AC_CONFIG_SRCDIR([bzlib.h]) ++AC_CONFIG_MACRO_DIR([m4]) ++ ++AM_INIT_AUTOMAKE ++AM_MAINTAINER_MODE ++ ++# Checks for programs. ++AC_PROG_AWK ++AC_PROG_CC ++AC_PROG_INSTALL ++AC_PROG_LN_S ++AC_PROG_MAKE_SET ++AC_PROG_LIBTOOL ++PKG_PROG_PKG_CONFIG ++ ++# Checks for libraries. ++ ++# Checks for header files. ++ ++# Checks for typedefs, structures, and compiler characteristics. ++ ++# Check for system features. ++AC_SYS_LARGEFILE ++ ++AC_MSG_CHECKING([whether compiler understands -Wall]) ++save_CFLAGS="$CFLAGS" ++CFLAGS="$CFLAGS -Wall" ++AC_TRY_COMPILE([], [], [ ++ AC_MSG_RESULT([yes]) ++], [ ++ AC_MSG_RESULT([no]) ++ CFLAGS="$save_CFLAGS" ++]) ++ ++AC_MSG_CHECKING([whether compiler understands -Winline]) ++save_CFLAGS="$CFLAGS" ++CFLAGS="$CFLAGS -Winline" ++AC_TRY_COMPILE([], [], [ ++ AC_MSG_RESULT([yes]) ++], [ ++ AC_MSG_RESULT([no]) ++ CFLAGS="$save_CFLAGS" ++]) ++ ++AC_MSG_CHECKING([whether compiler understands -fno-strength-reduce]) ++save_CFLAGS="$CFLAGS" ++CFLAGS="$CFLAGS -fno-strength-reduce" ++AC_TRY_COMPILE([], [], [ ++ AC_MSG_RESULT([yes]) ++], [ ++ AC_MSG_RESULT([no]) ++ CFLAGS="$save_CFLAGS" ++]) ++ ++# Checks for library functions. ++ ++# Write the output. ++AC_SUBST([BZIP2_LT_CURRENT]) ++AC_SUBST([BZIP2_LT_REVISION]) ++AC_SUBST([BZIP2_LT_AGE]) ++AC_CONFIG_FILES([Makefile bzip2.pc]) ++AC_OUTPUT diff --git a/recipes/bzip2/bzip2.inc b/recipes/bzip2/bzip2.inc index e11ab73..e890429 100644 --- a/recipes/bzip2/bzip2.inc +++ b/recipes/bzip2/bzip2.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Very high-quality data compression program" RECIPE_TYPES = "machine native sdk" -inherit autotools pkgconfig +inherit autotools-autoreconf pkgconfig SRC_URI = "http://www.bzip.org/${PV}/bzip2-${PV}.tar.gz" @@ -35,7 +35,9 @@ RDEPENDS_${PN}-bzgrep = "${PN}-libbz2" RDEPENDS_${PN}-bzip2recover = "${PN}-libbz2" RDEPENDS_${PN}-bzmore = "${PN}-libbz2" -do_configure () { +do_autoreconf () { + if [ -d "${pkgltdldir}" ] ; then + export _lt_pkgdatadir="${pkgltdldir}" + fi bash ./autogen.sh - do_configure_autotools }