mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 03:30:05 +02:00
libburn: bump to 1.4.4, drop libtool file, add x86 secondary arch.
This commit is contained in:
@@ -7,16 +7,25 @@ COPYRIGHT="2006-2016 Mario Danic and Thomas Schmitt"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="http://files.libburnia-project.org/releases/libburn-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="33cfcd7f5deb3c6f325ca9eaef36c59b4fcb384bfcddaaa16d9a89da88a80edb"
|
||||
SOURCE_DIR="libburn-1.4.2"
|
||||
CHECKSUM_SHA256="1bf7040d6f1274acd868aec02a3c13241d0da8d9078067d228f2966ca40e7d14"
|
||||
SOURCE_DIR="libburn-$portVersion"
|
||||
PATCHES="libburn-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
|
||||
|
||||
if [ "$targetArchitecture" != x86_gcc2 ]; then
|
||||
commandSuffix=$secondaryArchSuffix
|
||||
commandBinDir=$binDir
|
||||
else
|
||||
commandSuffix=
|
||||
commandBinDir=$prefix/bin
|
||||
fi
|
||||
|
||||
PROVIDES="
|
||||
libburn$secondaryArchSuffix = $portVersion compat >= 1
|
||||
cmd:cdrskin$secondaryArchSuffix
|
||||
lib:libburn$secondaryArchSuffix = 4.95.0 compat >= 4
|
||||
cmd:cdrskin$commandSuffix
|
||||
lib:libburn$secondaryArchSuffix = 4.97.0 compat >= 4
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
@@ -24,7 +33,7 @@ REQUIRES="
|
||||
|
||||
PROVIDES_devel="
|
||||
libburn${secondaryArchSuffix}_devel = $portVersion compat >= 1
|
||||
devel:libburn$secondaryArchSuffix = 4.95.0 compat >= 4
|
||||
devel:libburn$secondaryArchSuffix = 4.97.0 compat >= 4
|
||||
"
|
||||
REQUIRES_devel="
|
||||
libburn$secondaryArchSuffix == $portVersion base
|
||||
@@ -40,7 +49,7 @@ BUILD_PREREQUIRES="
|
||||
cmd:automake
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:libtoolize
|
||||
cmd:libtoolize$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
@@ -75,7 +84,7 @@ http://cdrtools.sourceforge.net/private/man/cdrecord/cdrecord.1.html," \
|
||||
BUILD()
|
||||
{
|
||||
autoreconf -fi
|
||||
runConfigure ./configure
|
||||
runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
@@ -83,10 +92,18 @@ INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
prepareInstalledDevelLibs libburn
|
||||
# remove libtool file
|
||||
rm $libDir/libburn.la
|
||||
|
||||
prepareInstalledDevelLib libburn
|
||||
fixPkgconfig
|
||||
|
||||
# devel package
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
make check
|
||||
}
|
||||
@@ -1,15 +0,0 @@
|
||||
From: fbrosson <fbrosson@users.noreply.github.com>
|
||||
Subject: fix pthread detection in configure.ac for Haiku
|
||||
|
||||
diff -upr libburn-1.4.2/configure.ac libburn-1.4.2-haiku/configure.ac
|
||||
--- libburn-1.4.2/configure.ac 2016-01-29 11:10:12.000000000 +0000
|
||||
+++ libburn-1.4.2-haiku/configure.ac
|
||||
@@ -192,7 +192,7 @@ AC_PROG_INSTALL
|
||||
|
||||
AC_CHECK_HEADERS()
|
||||
|
||||
-THREAD_LIBS=-lpthread
|
||||
+AC_CHECK_LIB(pthread,pthread_self,THREAD_LIBS=-lpthread)
|
||||
AC_SUBST(THREAD_LIBS)
|
||||
|
||||
TARGET_SHIZZLE
|
||||
22
dev-libs/libburn/patches/libburn-1.4.4.patchset
Normal file
22
dev-libs/libburn/patches/libburn-1.4.4.patchset
Normal file
@@ -0,0 +1,22 @@
|
||||
From b231830390a41bed4330952662990246ded0bf6a Mon Sep 17 00:00:00 2001
|
||||
From: fbrosson <fbrosson@localhost>
|
||||
Date: Fri, 1 Jul 2016 19:48:39 +0000
|
||||
Subject: Haiku patch
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 0cc31c5..6d95272 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -193,7 +193,7 @@ AC_PROG_INSTALL
|
||||
|
||||
AC_CHECK_HEADERS()
|
||||
|
||||
-THREAD_LIBS=-lpthread
|
||||
+AC_CHECK_LIB(pthread,pthread_self,THREAD_LIBS=-lpthread)
|
||||
AC_SUBST(THREAD_LIBS)
|
||||
|
||||
TARGET_SHIZZLE
|
||||
--
|
||||
2.9.0
|
||||
|
||||
Reference in New Issue
Block a user