Page MenuHomeFreeBSD
Differential D11612 Diff 31077 audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh

Changeset View

Standalone View

View Options

audio/logitechmediaserver/files/vendorpatch-CPAN_buildme.sh

--- ../slimserver-vendor-14cc392/CPAN/buildme.sh.orig 2016-08-12 21:27:39.000000000 +0800 --- ../slimserver-vendor-1463b00/CPAN/buildme.sh.orig 2017-06-07 14:29:20.000000000 +0100
+++ ../slimserver-vendor-14cc392/CPAN/buildme.sh 2016-11-13 13:08:08.765866000 +0800 +++ ../slimserver-vendor-1463b00/CPAN/buildme.sh 2017-07-12 21:44:11.808290000 +0100
@@ -92,7 +92,7 @@ @@ -92,7 +92,7 @@
exit exit
fi fi
-for i in gcc cpp rsync make rsync ; do -for i in gcc cpp rsync make rsync ; do
+for i in cc cpp rsync make rsync ; do +for i in cc cpp rsync make rsync ; do
which $i > /dev/null which $i > /dev/null
if [ $? -ne 0 ] ; then if [ $? -ne 0 ] ; then
echo "$i not found - please install it" echo "$i not found - please install it"
@@ -309,6 +309,19 @@ @@ -556,6 +556,19 @@
PERL_ARCH=$BUILD/arch/5.22 # because it takes so damn long on slow platforms
fi if [ ! -f build/lib/libicudata_s.a ]; then
tar_wrapper zxvf icu4c-4_6-src.tgz
+# Path to Perl 5.24 + patch << END
+if [ -x "/usr/bin/perl5.24.1" ]; then +--- icu/source/i18n/uspoof.cpp.orig 2017-07-12 21:35:34.014645000 +0100
+ PERL_524=/usr/bin/perl5.24.1 ++++ icu/source/i18n/uspoof.cpp 2017-07-12 21:33:44.790884000 +0100
+fi +@@ -366,7 +366,7 @@
+ + // u_strToUTF8() in preflight mode is an easy way to do it.
+if [ $PERL_524 ]; then + U_ASSERT(position16 <= len16);
+ echo "Building with Perl 5.24 at $PERL_524" + u_strToUTF8(NULL, 0, position, text16, position16, status);
+ PERL_BIN=$PERL_524 +- if (position > 0) {
+ # Install dir for 5.24 ++ if (position != NULL && *position > 0) {
+ PERL_BASE=$BUILD/5.24 + // position is the required buffer length from u_strToUTF8, which includes
+ PERL_ARCH=$BUILD/arch/5.24 + // space for a terminating NULL, which we don't want, hence the -1.
+fi + *position -= 1;
+ +END
# try to use default perl version cd icu/source
if [ "$PERL_BIN" = "" ]; then if [ "$OS" = 'Darwin' ]; then
PERL_BIN=`which perl` ICUFLAGS="$FLAGS $OSX_ARCH $OSX_FLAGS -DU_USING_ICU_NAMESPACE=0 -DU_CHARSET_IS_UTF8=1" # faster code for native UTF-8 systems
@@ -339,6 +352,9 @@ @@ -568,7 +581,7 @@
"5.22")
PERL_522=$PERL_BIN
;;
+ "5.24")
+ PERL_524=$PERL_BIN
+ ;;
*)
echo "Failed to find supported Perl version for '$PERL_BIN'"
exit
@@ -504,7 +520,7 @@
;;
Class::XSAccessor)
- if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then
+ if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then
build_module Class-XSAccessor-1.18
cp -pR $PERL_BASE/lib/perl5/$ARCH/Class $PERL_ARCH/
else
@@ -520,7 +536,7 @@
;;
DBI)
- if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then
+ if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then
build_module DBI-1.628
cp -p $PERL_BASE/lib/perl5/$ARCH/DBI.pm $PERL_ARCH/
cp -pR $PERL_BASE/lib/perl5/$ARCH/DBI $PERL_ARCH/
@@ -530,7 +546,7 @@
;;
DBD::SQLite)
- if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then
+ if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then
build_module DBI-1.628 "" 0
else
build_module DBI-1.616 "" 0
@@ -552,7 +568,7 @@
ICUOS="FreeBSD" ICUOS="FreeBSD"
fi fi
CFLAGS="$ICUFLAGS" CXXFLAGS="$ICUFLAGS" LDFLAGS="$FLAGS $OSX_ARCH $OSX_FLAGS" \ CFLAGS="$ICUFLAGS" CXXFLAGS="$ICUFLAGS" LDFLAGS="$FLAGS $OSX_ARCH $OSX_FLAGS" \
- ./runConfigureICU $ICUOS --prefix=$BUILD --enable-static --with-data-packaging=archive - ./runConfigureICU $ICUOS --prefix=$BUILD --enable-static --with-data-packaging=archive
+ ./configure --prefix=$BUILD --enable-static --with-data-packaging=archive + ./configure --prefix=$BUILD --enable-static --with-data-packaging=archive
$MAKE $MAKE
if [ $? != 0 ]; then if [ $? != 0 ]; then
echo "make failed" echo "make failed"
@@ -616,7 +632,7 @@ @@ -1239,6 +1252,9 @@
rm -rf DBD-SQLite-1.34_01
else
cd ..
- if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then
+ if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then
build_module DBD-SQLite-1.34_01 "" 0
fi
build_module DBD-SQLite-1.34_01
@@ -698,7 +714,7 @@
JSON::XS)
build_module common-sense-2.0
- if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then
+ if [ "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then
build_module JSON-XS-2.34
cp -pR $PERL_BASE/lib/perl5/$ARCH/JSON $PERL_ARCH/
else
@@ -728,7 +744,7 @@
;;
YAML::LibYAML)
- if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then
+ if [ "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then
build_module YAML-LibYAML-0.35 "" 0
else
build_module YAML-LibYAML-0.35
@@ -1223,6 +1239,9 @@
if [ "$ARCH" = "amd64-freebsd" -o "$ARCH" = "amd64-freebsd-thread-multi" ]; then if [ "$ARCH" = "amd64-freebsd" -o "$ARCH" = "amd64-freebsd-thread-multi" ]; then
FFOPTS="$FFOPTS --arch=x86" FFOPTS="$FFOPTS --arch=x86"
fi fi
+ if [ "$OS" = "FreeBSD" ]; then + if [ "$OS" = "FreeBSD" ]; then
+ FFOPTS="$FFOPTS --cc=clang" + FFOPTS="$FFOPTS --cc=clang"
+ fi + fi
if [ "$OS" = "Darwin" ]; then if [ "$OS" = "Darwin" ]; then
SAVED_FLAGS=$FLAGS SAVED_FLAGS=$FLAGS
@@ -1387,7 +1406,7 @@
# create our directory structure
# rsync is used to avoid copying non-binary modules or other extra stuff
-if [ "$PERL_512" -o "$PERL_514" -o "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" ]; then
+if [ "$PERL_512" -o "$PERL_514" -o "$PERL_516" -o "$PERL_518" -o "$PERL_520" -o "$PERL_522" -o "$PERL_524" ]; then
# Check for Perl using use64bitint and add -64int
ARCH=`$PERL_BIN -MConfig -le 'print $Config{archname}' | sed 's/gnu-//' | sed 's/^i[3456]86-/i386-/' | sed 's/armv.*?-/arm-/' `
fi