From 031526ba8669193e837abf704dddf17498ea5362 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Sun, 20 Mar 2016 22:51:42 +0000 Subject: [PATCH] parted: bump to version 3.2. * Bump to version 3.2. * Drop patch "replace deprecated CPPFunction by rl_completion_func_t" as it has been applied upstream. * Add patch to insert "AC_CONFIG_MACRO_DIR([m4])" in configure.ac. * Add patch to use -lroot instead of -ldl. * Don't pass "--disable-dynamic-loading" to configure script as it is now able to find dlopen in libroot. * Patch lib/gnulib.mk to skip the installtion of lib/charset.alias. * Change broken to untested for x86{,_64} as it builds fine on these architectures and even seems to work fine on x86 primary arch. --- sys-block/parted/parted-3.1.53_git.recipe | 71 ----------- sys-block/parted/parted-3.2.recipe | 110 +++++++++++++++++ ....1.53_git.patchset => parted-3.2.patchset} | 116 +++++++++++++----- 3 files changed, 193 insertions(+), 104 deletions(-) delete mode 100644 sys-block/parted/parted-3.1.53_git.recipe create mode 100644 sys-block/parted/parted-3.2.recipe rename sys-block/parted/patches/{parted-3.1.53_git.patchset => parted-3.2.patchset} (74%) diff --git a/sys-block/parted/parted-3.1.53_git.recipe b/sys-block/parted/parted-3.1.53_git.recipe deleted file mode 100644 index a3b7ea407..000000000 --- a/sys-block/parted/parted-3.1.53_git.recipe +++ /dev/null @@ -1,71 +0,0 @@ -SUMMARY="The GNU partition editor" -DESCRIPTION="GNU Parted manipulates partition tables. This is useful for \ -creating space for new operating systems, reorganizing disk usage, copying \ -data on hard disks and disk imaging." -HOMEPAGE="http://www.gnu.org/software/parted" -COPYRIGHT="1999-2007 Free Software Foundation Inc." -LICENSE="GNU GPL v3" -REVISION="1" -SOURCE_URI="git://git.debian.org/git/parted/parted.git#1c659d5cc6830c6f4f26660e9049582afbad3fd3" - -ARCHITECTURES="!x86_gcc2 !x86 !x86_64" -SECONDARY_ARCHITECTURES="!x86_gcc2 !x86" - -PROVIDES=" - parted$secondaryArchSuffix = $portVersion - cmd:parted$secondaryArchSuffix = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libiconv$secondaryArchSuffix - lib:libintl$secondaryArchSuffix - lib:libncurses$secondaryArchSuffix - lib:libreadline$secondaryArchSuffix - lib:libuuid$secondaryArchSuffix - " - -BUILD_REQUIRES=" - devel:libiconv$secondaryArchSuffix - devel:libintl$secondaryArchSuffix - devel:libncurses$secondaryArchSuffix - devel:libreadline$secondaryArchSuffix - devel:libuuid$secondaryArchSuffix - " - -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:git - cmd:autoconf - cmd:gawk - cmd:grep - cmd:libtool - cmd:make - cmd:makeinfo - cmd:gcc$secondaryArchSuffix - cmd:gnulib_tool$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:gperf - cmd:pkg_config$secondaryArchSuffix - cmd:rsync - cmd:gettext - " - -PATCHES="parted-3.1.53_git.patchset" - -# TODO: Fix libdl test in configure.ac -BUILD() -{ - ./bootstrap - runConfigure ./configure --disable-dynamic-loading --disable-device-mapper - make -} - -INSTALL() -{ - make install -} - -TEST() -{ - make check -} diff --git a/sys-block/parted/parted-3.2.recipe b/sys-block/parted/parted-3.2.recipe new file mode 100644 index 000000000..f29f1585c --- /dev/null +++ b/sys-block/parted/parted-3.2.recipe @@ -0,0 +1,110 @@ +SUMMARY="The GNU partition editor" +DESCRIPTION="GNU Parted manipulates partition tables. This is useful for \ +creating space for new operating systems, reorganizing disk usage, copying \ +data on hard disks and disk imaging." +HOMEPAGE="https://www.gnu.org/software/parted/" +COPYRIGHT="1999-2014 Free Software Foundation Inc." +LICENSE="GNU GPL v3" +REVISION="1" +SOURCE_URI="http://ftp.gnu.org/gnu/parted/parted-$portVersion.tar.xz" +CHECKSUM_SHA256="858b589c22297cacdf437f3baff6f04b333087521ab274f7ab677cb8c6bb78e4" +PATCHES="parted-$portVersion.patchset" + +ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" +SECONDARY_ARCHITECTURES="!x86_gcc2 ?x86" + +# On x86_gcc2 we don't want to install the commands in bin//, but in bin/. +commandSuffix=$secondaryArchSuffix +commandBinDir=$binDir +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi + +PROVIDES=" + parted$secondaryArchSuffix = $portVersion + cmd:parted$commandSuffix = $portVersion + cmd:partprobe$commandSuffix = $portVersion + lib:libparted$secondaryArchSuffix = 2.0.1 compat >= 2 + lib:libparted_fs_resize$secondaryArchSuffix = 0.0.1 compat >= 0 + " +REQUIRES=" + haiku$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libintl$secondaryArchSuffix + lib:libncurses$secondaryArchSuffix + lib:libreadline$secondaryArchSuffix + lib:libuuid$secondaryArchSuffix + " + +PROVIDES_devel=" + parted${secondaryArchSuffix}_devel = $portVersion + devel:libparted$secondaryArchSuffix = 2.0.1 compat >= 2 + devel:libparted_fs_resize$secondaryArchSuffix = 0.0.1 compat >= 0 + " +REQUIRES_devel=" + parted$secondaryArchSuffix == $portVersion base + devel:libiconv$secondaryArchSuffix + devel:libintl$secondaryArchSuffix + devel:libncurses$secondaryArchSuffix + devel:libreadline$secondaryArchSuffix + devel:libuuid$secondaryArchSuffix + " + +BUILD_REQUIRES=" + haiku${secondaryArchSuffix}_devel + devel:libiconv$secondaryArchSuffix + devel:libintl$secondaryArchSuffix + devel:libncurses$secondaryArchSuffix + devel:libreadline$secondaryArchSuffix + devel:libuuid$secondaryArchSuffix + " + +BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:autom4te + cmd:automake + cmd:autoreconf + cmd:awk + cmd:gcc$secondaryArchSuffix + cmd:gettext + cmd:gnulib_tool$secondaryArchSuffix + cmd:gperf + cmd:grep + cmd:iconv + cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix + cmd:make + cmd:makeinfo + cmd:pkg_config$secondaryArchSuffix + cmd:sed + " + +BUILD() +{ + autoreconf + runConfigure --omit-dirs sbinDir ./configure --sbindir=$commandBinDir \ + --disable-device-mapper + make $jobArgs +} + +INSTALL() +{ + make install + + prepareInstalledDevelLibs \ + libparted \ + libparted-fs-resize + + fixPkgconfig + + # devel package + packageEntries devel \ + $developDir +} + +TEST() +{ + make check +} diff --git a/sys-block/parted/patches/parted-3.1.53_git.patchset b/sys-block/parted/patches/parted-3.2.patchset similarity index 74% rename from sys-block/parted/patches/parted-3.1.53_git.patchset rename to sys-block/parted/patches/parted-3.2.patchset index 85a3f6f35..2e08f94c4 100644 --- a/sys-block/parted/patches/parted-3.1.53_git.patchset +++ b/sys-block/parted/patches/parted-3.2.patchset @@ -1,7 +1,7 @@ From 8a3bdcae63f930cff0200f033e50eaa2fe8f8cef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Thu, 22 Jul 2010 14:02:34 +0200 -Subject: [PATCH 1/7] build: Add Haiku as a supported OS +Subject: build: Add Haiku as a supported OS using the BeOS backend which should be compatible. --- @@ -29,7 +29,7 @@ index b04eb3f..00a991b 100644 From 46e8c05bb09e9bcfe690039cd22f6a3988dbcd8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Tue, 22 Dec 2015 00:32:27 +0100 -Subject: [PATCH 2/7] libparted: fix ZETA check +Subject: libparted: fix ZETA check Haiku doesn't define those. --- @@ -74,7 +74,7 @@ index 6a8a5ae..168f58b 100644 From 0cfd6f520aa3da1b6da6e45b0509857c6a1ba567 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Tue, 22 Dec 2015 00:35:19 +0100 -Subject: [PATCH 3/7] xfs: define loff_t for platforms lacking it +Subject: xfs: define loff_t for platforms lacking it It's not a POSIX type. --- @@ -103,7 +103,7 @@ index 2b55752..b754979 100644 From 662700691d3bebc085ca36f0674f6261640c25b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Tue, 22 Dec 2015 01:01:53 +0100 -Subject: [PATCH 4/7] libparted: fix Haiku build +Subject: libparted: fix Haiku build --- libparted/arch/beos.c | 25 ++++++++++++++++++++++--- @@ -218,7 +218,7 @@ index 168f58b..da05f2e 100644 From 9c306e4985dfbfb94ec9b207a38749ad7ccbc2cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Tue, 22 Dec 2015 01:02:22 +0100 -Subject: [PATCH 5/7] build: use -lnetwork on Haiku, not -lsocket +Subject: build: use -lnetwork on Haiku, not -lsocket --- configure.ac | 17 ++++++++++++----- @@ -256,37 +256,10 @@ index 00a991b..3d88448 100644 2.2.2 -From 811bf6b4276df9d58407531c7615ebfd00858b26 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= -Date: Tue, 22 Dec 2015 01:48:40 +0100 -Subject: [PATCH 6/7] parted: replace deprecated CPPFunction by - rl_completion_func_t - ---- - parted/ui.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/parted/ui.c b/parted/ui.c -index 22790bb..5eafb2b 100644 ---- a/parted/ui.c -+++ b/parted/ui.c -@@ -1474,7 +1474,7 @@ init_readline (void) - #ifdef HAVE_LIBREADLINE - if (!opt_script_mode) { - rl_initialize (); -- rl_attempted_completion_function = (CPPFunction*) complete_function; -+ rl_attempted_completion_function = (rl_completion_func_t*) complete_function; - readline_state.in_readline = 0; - } - #endif --- -2.2.2 - - From a3cb2ab877064c01f8e6c67e59a44ab8455576a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Tue, 22 Dec 2015 02:02:37 +0100 -Subject: [PATCH 7/7] libparted: Haiku doesn't define __BEOS__ anymore +Subject: libparted: Haiku doesn't define __BEOS__ anymore --- libparted/architecture.c | 2 +- @@ -308,3 +281,80 @@ index b339dc4..901399e 100644 -- 2.2.2 + +From 12e0852afd98e23bdd8eab0b8e12bb2c92a05868 Mon Sep 17 00:00:00 2001 +From: fbrosson +Date: Wed, 16 Mar 2016 21:48:17 +0000 +Subject: Add "AC_CONFIG_MACRO_DIR([m4])" to configure.ac + + +diff --git a/configure.ac b/configure.ac +index 9b9d13a..16856eb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -6,7 +6,7 @@ dnl This file may be modified and/or distributed without restriction. + AC_PREREQ([2.63]) + AC_INIT([GNU parted], m4_esyscmd([build-aux/git-version-gen .version]), + [bug-parted@gnu.org]) +- ++AC_CONFIG_MACRO_DIR([m4]) + # When the most recent signed tag is v1.8.8.1, + # the above might set e.g., PACKAGE_VERSION='1.8.8.1.1-0bfc' + +-- +2.2.2 + + +From 48186e284a4f74c93a5961cd3ab50c2e44a98de5 Mon Sep 17 00:00:00 2001 +From: fbrosson +Date: Wed, 16 Mar 2016 21:48:17 +0000 +Subject: build: use -lroot on Haiku, not -ldl + + +diff --git a/configure.ac b/configure.ac +index 16856eb..f49c291 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -307,13 +307,13 @@ DL_LIBS="" + AC_SUBST([DYNAMIC_LOADING]) + DYNAMIC_LOADING=no + if test "$enable_dynamic_loading" = yes; then +- AC_CHECK_LIB([dl], [dlopen], +- DL_LIBS="-ldl" +- PARTED_LIBS="$PARTED_LIBS -ldl" ++ AC_CHECK_LIB([root], [dlopen], ++ DL_LIBS="-lroot" ++ PARTED_LIBS="$PARTED_LIBS -lroot" + DYNAMIC_LOADING=yes + AC_DEFINE([DYNAMIC_LOADING], [1], [Lazy linking to fs libs]), + AC_MSG_ERROR( +- [-ldl not found! Try using --disable-dynamic-loading] ++ [-lroot not found! Try using --disable-dynamic-loading] + ) + ) + fi +-- +2.2.2 + + +From 8d65604e26ab20d2bf2a0cbd95821e95cd9c9384 Mon Sep 17 00:00:00 2001 +From: fbrosson +Date: Wed, 16 Mar 2016 21:48:17 +0000 +Subject: Do not install lib/charset.alias. + + +diff --git a/lib/gnulib.mk b/lib/gnulib.mk +index bbc592a..9084514 100644 +--- a/lib/gnulib.mk ++++ b/lib/gnulib.mk +@@ -573,7 +573,7 @@ install-exec-localcharset: all-local + case '$(host_os)' in \ + darwin[56]*) \ + need_charset_alias=true ;; \ +- darwin* | cygwin* | mingw* | pw32* | cegcc*) \ ++ darwin* | cygwin* | mingw* | pw32* | cegcc* | haiku*) \ + need_charset_alias=false ;; \ + *) \ + need_charset_alias=true ;; \ +-- +2.2.2