From fd2bb2f751c13b3c0c002b8e012810902b9da364 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 8 Jun 2018 02:02:24 -0500
Subject: harmony -> system

---
 system/parted/fix-libintl-header-s390x.patch | 58 ++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 system/parted/fix-libintl-header-s390x.patch

(limited to 'system/parted/fix-libintl-header-s390x.patch')

diff --git a/system/parted/fix-libintl-header-s390x.patch b/system/parted/fix-libintl-header-s390x.patch
new file mode 100644
index 000000000..68ae7d270
--- /dev/null
+++ b/system/parted/fix-libintl-header-s390x.patch
@@ -0,0 +1,58 @@
+From 4b2a566a3e007184d3ee9ce5b399a63eebbdadc3 Mon Sep 17 00:00:00 2001
+From: "Tuan M. Hoang" <tmhoang@flatglobe.org>
+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 <parted/fdasd.h>
+ #include <arch/linux.h>
+ 
+-#include <libintl.h>
+ #if ENABLE_NLS
++#  include <libintl.h>
+ #  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 <parted/parted.h>
+ 
+-#include <libintl.h>
+ #if ENABLE_NLS
++#  include <libintl.h>
+ #  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 <parted/parted.h>
+ 
+-#include <libintl.h>
+ #if ENABLE_NLS
++#  include <libintl.h>
+ #  define _(String) dgettext (PACKAGE, String)
+ #else
+ #  define _(String) (String)
+-- 
+2.11.1
+
-- 
cgit v1.2.3-60-g2f50