mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-04 22:18:55 +02:00
Alien::SVN: fix build
- gcc2 fixes - fix installation rule to use the proper paths
This commit is contained in:
@@ -1,16 +1,17 @@
|
|||||||
SUMMARY="Core module of the subversion perl bindings"
|
SUMMARY="Core module of the subversion perl bindings"
|
||||||
DESCRIPTION="SVN::Core implements higher level functions of fundamental \
|
DESCRIPTION="SVN::Core implements higher level functions of fundamental \
|
||||||
subversion functions."
|
subversion functions."
|
||||||
HOMEPAGE="http://search.cpan.org/~mschwern/Alien-SVN-v1.7.17.1/src/subversion/subversion/bindings/swig/perl/native/Core.pm"
|
HOMEPAGE="http://search.cpan.org/dist/Alien-SVN/"
|
||||||
REVISION="1"
|
REVISION="1"
|
||||||
COPYRIGHT="2010-2014 Apache Software Foundation"
|
COPYRIGHT="2010-2015 Apache Software Foundation"
|
||||||
LICENSE="Artistic"
|
LICENSE="Artistic"
|
||||||
|
|
||||||
SOURCE_URI="http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/Alien-SVN-v1.7.17.1.tar.gz"
|
SOURCE_URI="http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/Alien-SVN-v$portVersion.tar.gz"
|
||||||
CHECKSUM_SHA256="35ae83fda2ef9a5b48012ac8317ec063058d1e9fc5f2719fa141eecedf6baef8"
|
CHECKSUM_SHA256="acf8ebce1cb6958ef24611a453abee32b8e4dfe767563834362891ef3f30fc68"
|
||||||
SOURCE_DIR="Alien-SVN-v1.7.17.1"
|
SOURCE_DIR="Alien-SVN-v$portVersion"
|
||||||
|
PATCHES="alien_svn-$portVersion.patchset"
|
||||||
|
|
||||||
ARCHITECTURES="!x86_gcc2"
|
ARCHITECTURES="x86_gcc2"
|
||||||
|
|
||||||
PROVIDES="
|
PROVIDES="
|
||||||
alien_svn = $portVersion
|
alien_svn = $portVersion
|
||||||
@@ -36,11 +37,13 @@ BUILD_PREREQUIRES="
|
|||||||
|
|
||||||
BUILD()
|
BUILD()
|
||||||
{
|
{
|
||||||
perl Build.PL PREFIX=$prefix
|
export CFLAGS=-O0
|
||||||
|
export PERL_MM_USE_DEFAULT=1 # Don't ask questions and use the default values
|
||||||
|
perl Build.PL --installdirs vendor --prefix $prefix
|
||||||
./Build
|
./Build
|
||||||
}
|
}
|
||||||
|
|
||||||
INSTALL()
|
INSTALL()
|
||||||
{
|
{
|
||||||
make install DESTIDR="${DESTDIR}"
|
./Build install --installdirs vendor
|
||||||
}
|
}
|
||||||
85
dev-perl/alien_svn/patches/alien_svn-1.8.11.0.patchset
Normal file
85
dev-perl/alien_svn/patches/alien_svn-1.8.11.0.patchset
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
From 220c627e1547dacb3d21c26f185cbeb7814384fb Mon Sep 17 00:00:00 2001
|
||||||
|
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||||
|
Date: Sun, 27 Mar 2016 09:18:25 +0200
|
||||||
|
Subject: Fix use of deprecated find_directory constant.
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/subversion/subversion/libsvn_subr/config_file.c b/src/subversion/subversion/libsvn_subr/config_file.c
|
||||||
|
index 9969b8e..a08410b 100644
|
||||||
|
--- a/src/subversion/subversion/libsvn_subr/config_file.c
|
||||||
|
+++ b/src/subversion/subversion/libsvn_subr/config_file.c
|
||||||
|
@@ -401,7 +401,7 @@ svn_config__sys_config_path(const char **path_p,
|
||||||
|
{
|
||||||
|
char folder[B_PATH_NAME_LENGTH];
|
||||||
|
|
||||||
|
- status_t error = find_directory(B_COMMON_SETTINGS_DIRECTORY, -1, false,
|
||||||
|
+ status_t error = find_directory(B_SYSTEM_SETTINGS_DIRECTORY, -1, false,
|
||||||
|
folder, sizeof(folder));
|
||||||
|
if (error)
|
||||||
|
return SVN_NO_ERROR;
|
||||||
|
--
|
||||||
|
2.7.0
|
||||||
|
|
||||||
|
|
||||||
|
From 5491e3bf8b70362fb8160a9e466ab91e85e2b689 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||||
|
Date: Sun, 27 Mar 2016 16:55:17 +0200
|
||||||
|
Subject: Remove -g from cflags as it confuses gcc2.
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/subversion/configure b/src/subversion/configure
|
||||||
|
index ad65cab..2a1657c 100755
|
||||||
|
--- a/src/subversion/configure
|
||||||
|
+++ b/src/subversion/configure
|
||||||
|
@@ -3386,9 +3386,9 @@ if test "$ac_test_CFLAGS" = set; then
|
||||||
|
CFLAGS=$ac_save_CFLAGS
|
||||||
|
elif test $ac_cv_prog_cc_g = yes; then
|
||||||
|
if test "$GCC" = yes; then
|
||||||
|
- CFLAGS="-g -O2"
|
||||||
|
+ CFLAGS="-O2"
|
||||||
|
else
|
||||||
|
- CFLAGS="-g"
|
||||||
|
+ CFLAGS=""
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
if test "$GCC" = yes; then
|
||||||
|
diff --git a/src/subversion/configure.ac b/src/subversion/configure.ac
|
||||||
|
index 955ba25..477a7ab 100644
|
||||||
|
--- a/src/subversion/configure.ac
|
||||||
|
+++ b/src/subversion/configure.ac
|
||||||
|
@@ -1046,8 +1046,7 @@ if test "$enable_debugging" = "yes" ; then
|
||||||
|
SVN_CFLAGS_ADD_IFELSE([-fno-inline])
|
||||||
|
SVN_CFLAGS_ADD_IFELSE([-fno-omit-frame-pointer])
|
||||||
|
SVN_CFLAGS_ADD_IFELSE([-g3],[],[
|
||||||
|
- SVN_CFLAGS_ADD_IFELSE([-g2],[],[
|
||||||
|
- SVN_CFLAGS_ADD_IFELSE([-g])])])
|
||||||
|
+ SVN_CFLAGS_ADD_IFELSE([-g2],[],[])])
|
||||||
|
fi
|
||||||
|
if test -z ["`echo $CXXUSERFLAGS' ' | $EGREP -- '-g[0-9]? '`"]; then
|
||||||
|
AC_MSG_NOTICE([Enabling debugging for C++])
|
||||||
|
@@ -1055,8 +1054,7 @@ if test "$enable_debugging" = "yes" ; then
|
||||||
|
SVN_CXXFLAGS_ADD_IFELSE([-fno-inline])
|
||||||
|
SVN_CXXFLAGS_ADD_IFELSE([-fno-omit-frame-pointer])
|
||||||
|
SVN_CXXFLAGS_ADD_IFELSE([-g3],[],[
|
||||||
|
- SVN_CXXFLAGS_ADD_IFELSE([-g2],[],[
|
||||||
|
- SVN_CXXFLAGS_ADD_IFELSE([-g])])])
|
||||||
|
+ SVN_CXXFLAGS_ADD_IFELSE([-g2],[],[])])
|
||||||
|
fi
|
||||||
|
dnl SVN_DEBUG enables specific features for developer builds
|
||||||
|
dnl AP_DEBUG enables specific (Apache) features for developer builds
|
||||||
|
diff --git a/src/subversion/subversion/bindings/swig/perl/native/Makefile.PL.in b/src/subversion/subversion/bindings/swig/perl/native/Makefile.PL.in
|
||||||
|
index a60430b..baacb60 100644
|
||||||
|
--- a/src/subversion/subversion/bindings/swig/perl/native/Makefile.PL.in
|
||||||
|
+++ b/src/subversion/subversion/bindings/swig/perl/native/Makefile.PL.in
|
||||||
|
@@ -84,7 +84,7 @@ my %config = (
|
||||||
|
" -I$swig_srcdir/perl/libsvn_swig_perl",
|
||||||
|
" -I$svnlib_srcdir/include",
|
||||||
|
" -I$svnlib_builddir",
|
||||||
|
- " -I$swig_srcdir -g"),
|
||||||
|
+ " -I$swig_srcdir"),
|
||||||
|
OBJECT => q/$(O_FILES)/,
|
||||||
|
LIBS => [join(' ', $apr_ldflags,
|
||||||
|
(map {"-L$_"} @ldpaths),
|
||||||
|
--
|
||||||
|
2.7.0
|
||||||
|
|
||||||
Reference in New Issue
Block a user