From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-wi0-x22d.google.com ([2a00:1450:400c:c05::22d]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1YFTIf-0006Vj-Qc for ptxdist@pengutronix.de; Sun, 25 Jan 2015 20:56:50 +0100 Received: by mail-wi0-f173.google.com with SMTP id r20so6205919wiv.0 for ; Sun, 25 Jan 2015 11:56:44 -0800 (PST) From: Alexander Aring Date: Sun, 25 Jan 2015 20:56:21 +0100 Message-Id: <1422215784-25936-2-git-send-email-alex.aring@gmail.com> In-Reply-To: <1422215784-25936-1-git-send-email-alex.aring@gmail.com> References: <1422215784-25936-1-git-send-email-alex.aring@gmail.com> Subject: [ptxdist] [PATCHv2 1/4] liblzo: rework and version bump Reply-To: ptxdist@pengutronix.de List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: ptxdist-bounces@pengutronix.de Errors-To: ptxdist-bounces@pengutronix.de To: ptxdist@pengutronix.de Cc: Alexander Aring This patch removes the menuentries to generate a static or shared library. Instead we do default a shared library now. Additional we do slightly a version bump to 2.08 liblzo version. Signed-off-by: Alexander Aring --- rules/liblzo.in | 18 ------------------ rules/liblzo.make | 11 +++++------ 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/rules/liblzo.in b/rules/liblzo.in index 62c74c7..d416b59 100644 --- a/rules/liblzo.in +++ b/rules/liblzo.in @@ -9,21 +9,3 @@ menuconfig LIBLZO Compiles the LZO compression libraries on your target system. See http://www.oberhumer.com/opensource/lzo/ for info about it. - -if LIBLZO - -config LIBLZO_SHARED - bool - default y - prompt "Create shared library" - help - Create a shared library and install it into /usr/lib - -config LIBLZO_STATIC - bool - prompt "Create static link library" - help - Create a static link library and install it into /usr/lib. - Normally not needed. - -endif diff --git a/rules/liblzo.make b/rules/liblzo.make index 2bcb25f..dcb4c9e 100644 --- a/rules/liblzo.make +++ b/rules/liblzo.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_LIBLZO) += liblzo # # Paths and names # -LIBLZO_VERSION := 2.03 -LIBLZO_MD5 := 0c3d078c2e8ea5a88971089a2f02a726 +LIBLZO_VERSION := 2.08 +LIBLZO_MD5 := fcec64c26a0f4f4901468f360029678f LIBLZO := lzo-$(LIBLZO_VERSION) LIBLZO_SUFFIX := tar.gz LIBLZO_URL := http://www.oberhumer.com/opensource/lzo/download/$(LIBLZO).$(LIBLZO_SUFFIX) @@ -38,8 +38,8 @@ LIBLZO_ENV := $(CROSS_ENV) # LIBLZO_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ - --$(call ptx/endis, PTXCONF_LIBLZO_SHARED)-shared \ - --$(call ptx/endis, PTXCONF_LIBLZO_STATIC)-static + --enable-shared \ + --disable-static # ---------------------------------------------------------------------------- # Target-Install @@ -54,9 +54,8 @@ $(STATEDIR)/liblzo.targetinstall: @$(call install_fixup, liblzo,AUTHOR,"Carsten Schlote ") @$(call install_fixup, liblzo,DESCRIPTION,missing) -ifdef PTXCONF_LIBLZO_SHARED @$(call install_lib, liblzo, 0, 0, 0644, liblzo2) -endif + @$(call install_finish, liblzo) @$(call touch) -- 2.2.2 -- ptxdist mailing list ptxdist@pengutronix.de