X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by lists.alpinelinux.org (Postfix) with ESMTP id 1354A5C43A9 for ; Thu, 23 Feb 2017 08:09:33 +0000 (GMT) Received: by mail-qt0-f195.google.com with SMTP id n13so3437192qtc.0 for ; Thu, 23 Feb 2017 00:09:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flatglobe-org.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=E3dT/q/9frDII2G1inI9CsLyh1sLlyVLDOR0sYrbYXs=; b=1H3pWGHTYY0UQyl5/nmQsHbwwNS0oucRWCAKiJ2HzJBL/hbucr3EkJ/zAU/h53tVwY 7r+IgZpXTPNt27A694ihhqErLDRHGJdfEcMmxNWDNUfwmgHLiAYeYgZhZMHRSy0p+C+Y OPSKYcEpCf88RagK3uBPn00zCRl/78gQz9AWoazeOxGPm97Ugq/e/a0PA9wFkFqdGUDW 8OQ8qqsTRslQB53ML/YAhfuuv3ObgR+mrA0OnInIQGdzdkFN/d/JndQyJ65vT++0k0Vp K9wlF/cioWJazb8O/pc1mw23bMABPqKQsm0N+2bOclyJcjzFGRXzSkFjD5yoQ5BCsD3l ukMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=E3dT/q/9frDII2G1inI9CsLyh1sLlyVLDOR0sYrbYXs=; b=m8rqhLy4eA4XRVMA/9L6V28uIDswfZT/YUEZdr4E2Jhsamb33tpFwImM4nAMPB7mr/ JozUSJohywMdQjRWTH+2CLGoc92+HJrz4Gh31ZulgOMIRflF9R+Jnmh9gvvdlpMJ0qW2 qKWqzpByED2JP7KoE4y1cEjre24Po7EL9+1TtvIkOiHYnpmHaIh3Vcla6xvOBTryDNkb h/Y0AqGuaAj72zZ+h6BHWJPMgCrHwSWJbKLT/aKOvmVUPD6h1pnTDvQtKk5jho6VAU5X ps4ZTv3W1EjGfDs3jzTUTpwTVh0Whhxk3b8y+q1L7CKHc++S7lD+/saSY1NLnVhXj1XK LBKw== X-Gm-Message-State: AMke39nb/Zo9aZsUTfIkm8dxhQjyeiutvmrpvTDKgXNuA351Bg/h8BKGSU40IjaEr3kOFA== X-Received: by 10.200.44.74 with SMTP id e10mr36846857qta.145.1487837373168; Thu, 23 Feb 2017 00:09:33 -0800 (PST) Received: from localhost.localdomain (cpe-204-210-151-44.hvc.res.rr.com. [204.210.151.44]) by smtp.gmail.com with ESMTPSA id j11sm2303792qta.39.2017.02.23.00.09.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 23 Feb 2017 00:09:31 -0800 (PST) From: "Tuan M. Hoang" To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH v2] main/parted: disable nls on s390x Date: Thu, 23 Feb 2017 03:09:25 -0500 Message-Id: <1487837365-15377-1-git-send-email-tmhoang@flatglobe.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1487835331-14725-1-git-send-email-tmhoang@flatglobe.org> References: <1487835331-14725-1-git-send-email-tmhoang@flatglobe.org> X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: Change from v1 : Move libintl.h inside #if ENABLE_NLS --- main/parted/APKBUILD | 2 ++ main/parted/fix-libintl-header-s390x.patch | 58 ++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 main/parted/fix-libintl-header-s390x.patch diff --git a/main/parted/APKBUILD b/main/parted/APKBUILD index 5279697bf6..85931f4671 100644 --- a/main/parted/APKBUILD +++ b/main/parted/APKBUILD @@ -11,6 +11,7 @@ depends= makedepends="readline-dev ncurses-dev lvm2-dev bash util-linux-dev" source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz fix-includes.patch + fix-libintl-header-s390x.patch " _builddir="$srcdir"/$pkgname-$pkgver @@ -50,4 +51,5 @@ e87ffa1171acbebfa9d2475a093e7e64 fix-includes.patch" sha256sums="858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4 parted-3.2.tar.xz f87c9290e861b969f4520a1af84ebf4b8f5f1437c1d78ee235d5ffcda3bffe84 fix-includes.patch" sha512sums="4e37dbdd6f5032c9ebfec43704f6882379597d038167b9c4d04053efa083c68a705196713864451fa9e11d32777e16c68982877945c5efd9ea5f8252cb20e1c4 parted-3.2.tar.xz +444a7e2fb3235dfd218f6b71fb25adde107d001f638d988ee1fa79686d8efee94a9499e27bdfdd75f9718760b448938b70a90a74285b93a39338d21f4ab4c9dc fix-libintl-header-s390x.patch 55ee63c218d1867c0f2c596e7c3eec5c42af160181456cc551fe3d432eabed0ac2dd3a3955ff0c375f76aeec8071e7f55a32834b87a0d39b8ef30361f671bfdd fix-includes.patch" diff --git a/main/parted/fix-libintl-header-s390x.patch b/main/parted/fix-libintl-header-s390x.patch new file mode 100644 index 0000000000..68ae7d270f --- /dev/null +++ b/main/parted/fix-libintl-header-s390x.patch @@ -0,0 +1,58 @@ +From 4b2a566a3e007184d3ee9ce5b399a63eebbdadc3 Mon Sep 17 00:00:00 2001 +From: "Tuan M. Hoang" +Date: Thu, 23 Feb 2017 07:53:02 +0000 +Subject: [PATCH] main/parted: disable nls on s390x + +Because we build with --disable-nls by default, we need to remove libintl.h in +these files on s390x. This is specific for DASD devices only on s390x. +--- + libparted/labels/dasd.c | 2 +- + libparted/labels/fdasd.c | 2 +- + libparted/labels/vtoc.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libparted/labels/dasd.c b/libparted/labels/dasd.c +index fa9414f..5acf844 100644 +--- a/libparted/labels/dasd.c ++++ b/libparted/labels/dasd.c +@@ -40,8 +40,8 @@ + #include + #include + +-#include + #if ENABLE_NLS ++# include + # define _(String) dgettext (PACKAGE, String) + #else + # define _(String) (String) +diff --git a/libparted/labels/fdasd.c b/libparted/labels/fdasd.c +index 1f87937..e6a9086 100644 +--- a/libparted/labels/fdasd.c ++++ b/libparted/labels/fdasd.c +@@ -24,8 +24,8 @@ + + #include + +-#include + #if ENABLE_NLS ++# include + # define _(String) dgettext (PACKAGE, String) + #else + # define _(String) (String) +diff --git a/libparted/labels/vtoc.c b/libparted/labels/vtoc.c +index fdfa94f..64ba149 100644 +--- a/libparted/labels/vtoc.c ++++ b/libparted/labels/vtoc.c +@@ -12,8 +12,8 @@ + + #include + +-#include + #if ENABLE_NLS ++# include + # define _(String) dgettext (PACKAGE, String) + #else + # define _(String) (String) +-- +2.11.1 + -- 2.11.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---