X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by lists.alpinelinux.org (Postfix) with ESMTP id 60DC75C43A5 for ; Thu, 23 Feb 2017 07:35:38 +0000 (GMT) Received: by mail-qk0-f195.google.com with SMTP id r90so3679517qki.3 for ; Wed, 22 Feb 2017 23:35:38 -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; bh=QU4qYSpWdTl8QCSLmAL9GbmIW6IrLKW3UM7S+/CDKYc=; b=QBervz4wkzoaJrILdVNaahHg+lK8focZ6dDyV2DbLXsEUk+kuU9BvpkgLIBcHXZ3D1 HuDvr+0sbFznCMvWvnds4guKO7bJAzs5LW9zukyNXI0/cci5HBgMO/7MaJY5/5Xvxhtu miTJSRALskWLyKcNwpKLFzQqrC1ULJFNfFd4yYkPkqu3syxs47o8jy5BdliQWvxDiQPB tTj8CgBFIqPYdXfpN7wxW2dZBwT4j7yQKyp+d5FWhr/U+tTAtImmPW4GaFaxI6s2t7lE YCWUV01zCn78YD4HPACwyqptIt3Pf/so9goFClaa6kkc8C1gu43mJykIvZM5Gzp18alF gWkA== 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; bh=QU4qYSpWdTl8QCSLmAL9GbmIW6IrLKW3UM7S+/CDKYc=; b=kXGF/MaEDcoOCvDNOmLFnDfxWPmUhPdu64llmJaFIOVX24SpUmwMcVucfd/qNjDp5j iX2EwC1yuHlz591O6GXNpNoU7ehUzB2kStgGePp4X9iFyMPcqEWoI3IOXvUMuH/UnBj1 EtCtJN0gfu+771fjuAMJYybKi3JxDKMfh+G/MRyByQAioVHIlPEXER+LKgYcVzFURd9u 8w+DUT45m0H8g2y1gHZsnx56SA4sU8d+/JfFYzYt4QlFnSSJJ8VUlh/DX0hZioV8kOXD WfATokGRvmYS+/WGKgMF+cJz508O0PMTIbsXweBCVCClJJ8IjCmIj5Yg0wvu+Vs+WIAW lTqQ== X-Gm-Message-State: AMke39n1h/NNjP8OdHno4MDkW04ndJGTrDdgRmTs9ZtkW+yxcRVlLKEQDiOVbi7bsWAY+Q== X-Received: by 10.55.126.2 with SMTP id z2mr19276315qkc.281.1487835337394; Wed, 22 Feb 2017 23:35:37 -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 c12sm2256889qtg.62.2017.02.22.23.35.36 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 22 Feb 2017 23:35:36 -0800 (PST) From: "Tuan M. Hoang" To: alpine-aports@lists.alpinelinux.org Subject: [alpine-aports] [PATCH] main/parted: disable nls on s390x Date: Thu, 23 Feb 2017 02:35:31 -0500 Message-Id: <1487835331-14725-1-git-send-email-tmhoang@flatglobe.org> X-Mailer: git-send-email 2.1.4 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- main/parted/APKBUILD | 3 ++ main/parted/fix-libintl-header-s390x.patch | 52 ++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 main/parted/fix-libintl-header-s390x.patch diff --git a/main/parted/APKBUILD b/main/parted/APKBUILD index 5279697bf6..eabf101d40 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,6 @@ e87ffa1171acbebfa9d2475a093e7e64 fix-includes.patch" sha256sums="858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4 parted-3.2.tar.xz f87c9290e861b969f4520a1af84ebf4b8f5f1437c1d78ee235d5ffcda3bffe84 fix-includes.patch" sha512sums="4e37dbdd6f5032c9ebfec43704f6882379597d038167b9c4d04053efa083c68a705196713864451fa9e11d32777e16c68982877945c5efd9ea5f8252cb20e1c4 parted-3.2.tar.xz +f61ff35f4105167adc4bad07dcd504765fee28634526de545731b6105fd0d8c9dd13fb2c926f4aeda61e5555230d09cd729d169d10f13d2bf968d9cf3c868ce3 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..a304819083 --- /dev/null +++ b/main/parted/fix-libintl-header-s390x.patch @@ -0,0 +1,52 @@ +From faf522508e9e6193115f155be3220c4f3b585f34 Mon Sep 17 00:00:00 2001 +From: "Tuan M. Hoang" +Date: Thu, 23 Feb 2017 04:41:29 +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 | 1 - + libparted/labels/fdasd.c | 1 - + libparted/labels/vtoc.c | 1 - + 3 files changed, 3 deletions(-) + +diff --git a/libparted/labels/dasd.c b/libparted/labels/dasd.c +index fa9414f..3f1c0ba 100644 +--- a/libparted/labels/dasd.c ++++ b/libparted/labels/dasd.c +@@ -40,7 +40,6 @@ + #include + #include + +-#include + #if ENABLE_NLS + # define _(String) dgettext (PACKAGE, String) + #else +diff --git a/libparted/labels/fdasd.c b/libparted/labels/fdasd.c +index 1f87937..b0bcd5f 100644 +--- a/libparted/labels/fdasd.c ++++ b/libparted/labels/fdasd.c +@@ -24,7 +24,6 @@ + + #include + +-#include + #if ENABLE_NLS + # define _(String) dgettext (PACKAGE, String) + #else +diff --git a/libparted/labels/vtoc.c b/libparted/labels/vtoc.c +index fdfa94f..a8d1aa4 100644 +--- a/libparted/labels/vtoc.c ++++ b/libparted/labels/vtoc.c +@@ -12,7 +12,6 @@ + + #include + +-#include + #if ENABLE_NLS + # define _(String) dgettext (PACKAGE, String) + #else +-- +2.11.1 + -- 2.11.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---