haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

gettext: drop libtool files, update gettext compat to >= 0.19. (#874)

Browse Source 
Also drop devel:lib{iconv,ncurses} from REQUIRES.
This commit is contained in:
fbrosson
2016-11-20 16:41:58 +00:00
committed by Jérôme Duval
parent 17a8d6fe2e
commit 664317e78c
1 changed files with 9 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
sys-devel/gettext/gettext-0.19.8.1.recipe
View File

@@ -16,7 +16,7 @@ preparing these sets, or bringing them up to date.
HOMEPAGE="https://www.gnu.org/software/gettext/"
COPYRIGHT="1998-2016 Free Software Foundation, Inc."
LICENSE="GNU GPL v3"
REVISION="2"
REVISION="3"
SOURCE_URI="http://ftpmirror.gnu.org/gettext/gettext-$portVersion.tar.gz"
CHECKSUM_SHA256="ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43"
PATCHES="gettext-$portVersion.patchset"
@@ -25,7 +25,7 @@ ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES="
gettext$secondaryArchSuffix = $portVersion compat >= 0.18
gettext$secondaryArchSuffix = $portVersion compat >= 0.19
devel:libasprintf$secondaryArchSuffix = 0.0.0 compat >= 0
devel:libgettextlib$secondaryArchSuffix = $portVersion
devel:libgettextlib_$portVersion$secondaryArchSuffix
@@ -65,8 +65,6 @@ REQUIRES="
gettext${secondaryArchSuffix}_libintl == $portVersion base
lib:libiconv$secondaryArchSuffix
lib:libncurses$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
devel:libncurses$secondaryArchSuffix
"
if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
REQUIRES="$REQUIRES
@@ -77,12 +75,12 @@ fi
SUMMARY_libintl="The gettext internationalization library"
PROVIDES_libintl="
gettext${secondaryArchSuffix}_libintl = $portVersion compat >= 0.18
lib:libintl${secondaryArchSuffix} = 8.1.5 compat >= 8
gettext${secondaryArchSuffix}_libintl = $portVersion compat >= 0.19
lib:libintl$secondaryArchSuffix = 8.1.5 compat >= 8
"
REQUIRES_libintl="
haiku${secondaryArchSuffix}
lib:libiconv${secondaryArchSuffix}
haiku$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
"
BUILD_REQUIRES="
@@ -116,30 +114,15 @@ INSTALL()
{
make install AUTOCONF=: AUTOMAKE=: AUTOHEADER=: ACLOCAL=:
# remove libtool files
rm -f $libDir/lib*.la
rm $libDir/charset.alias
prepareInstalledDevelLibs libasprintf libgettextpo libintl
prepareInstalledDevelLib libgettextlib '*.so' '*'
prepareInstalledDevelLib libgettextsrc '*.so' '*'
# The libtool files reference other libraries using paths which
# become invalid if libiconv and/or ncurses6 are upgraded. We need to
# get rid of the versioning of libiconv and ncurses6 in our lib*.la.
local libiconv="$portPackageLinksDir/devel~libiconv$secondaryArchSuffix/$relativeDevelopLibDir"
local libncurses="$portPackageLinksDir/devel~libncurses$secondaryArchSuffix/$relativeDevelopLibDir"
sed -i \
-e "s,/packages/libiconv$secondaryArchSuffix-[^\ /]*/\.self/develop/$relativeLibDir/\(libiconv.la\),$libiconv/\1," \
-e "s,/packages/ncurses6$secondaryArchSuffix-[^\ /]*/\.self/develop/$relativeLibDir/\(libncurses.la\),$libncurses/\1," \
-e "/^dependency_libs=/ s/ -L[^'\ ]*//g" \
$developLibDir/lib*.la
if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
local libstdcpp="$portPackageLinksDir/gcc$secondaryArchSuffix"
sed -i \
-e "s,/packages/gcc$secondaryArchSuffix-[^\ /]*/\.self/\(develop/tools$secondaryArchSubDir/lib/gcc/$effectiveTargetMachineTriple/[^\ /]*/libstdc++.la\),$libstdcpp/\1," \
$developLibDir/libasprintf.la
fi
# libintl package
packageEntries libintl \
$libDir/libintl*