mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

- Fix build on 6.X

Browse Source 
- Fix build with python 2.5+

Submitted by:	Anders F Bjorklund <afb@rpm5.org> (maintainer)
This commit is contained in:
Pav Lucistnik 2010-09-23 10:48:04 +00:00
parent c577403b72
commit 13b18226f7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=261694
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
archivers/rpm5/Makefile
View File

@ -59,6 +59,7 @@ CONFIGURE_ARGS+=--without-lua
.if defined(WITH_PERL)
CONFIGURE_ARGS+=--with-perl
CONFIGURE_ENV+=__PERL=${PERL}
USE_PERL5= yes
PLIST_SUB+= PERL=""
.else
@ -67,7 +68,8 @@ PLIST_SUB+= PERL="@comment "
.endif
.if defined(WITH_PYTHON)
CONFIGURE_ARGS+=--with-python
CONFIGURE_ARGS+=--with-python=${PYTHON_VER}
CONFIGURE_ENV+=__PYTHON=${PYTHON_CMD}
USE_PYTHON= yes
PLIST_SUB+= PYTHON=""
CPPFLAGS+= -I${PYTHON_INCLUDEDIR}
@ -139,6 +141,13 @@ post-configure:
${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' Makefile
.endif
.if ${OSVERSION} < 700000
# on FreeBSD 6.x, <sys/mount.h> first requires <sys/param.h> (for NGROUPS)
post-configure::
@${REINPLACE_CMD} -e "s:/\* #undef HAVE_SYS_MOUNT_H \*/:#define HAVE_SYS_MOUNT_H 1:" \
${WRKSRC}/config.h
.endif
post-build:
.if !defined(NOPORTDOCS)
${MAKE} -C ${WRKSRC} apidocs

32
archivers/rpm5/files/patch-configure.ac Normal file
View File

@ -0,0 +1,32 @@
--- configure.ac.orig 2010-09-22 23:22:07.000000000 +0200
+++ configure.ac 2010-09-22 23:41:59.000000000 +0200
@@ -809,14 +809,14 @@
AC_ARG_WITH(python, AS_HELP_STRING([--with-python], [build with RPM Python language bindings]), [
if test ".$withval" != .no; then
case "$withval" in
- 2.x|2.3|2.4|2.5)
+ 2.x|2.3|2.4|2.5|2.6|2.7)
python_version=$withval
;;
yes)
- python_version="2.5 2.4 2.3 2.x"
+ python_version="2.7 2.6 2.5 2.4 2.3 2.x"
;;
*)
- AC_MSG_WARN([--with-python only supports values 2.x, 2.3, 2.4, or 2.5, ignoring...])
+ AC_MSG_WARN([--with-python only supports values 2.x, 2.3, 2.4, 2.5, 2.6, or 2.7, ignoring...])
python_version=""
;;
esac
@@ -894,9 +894,9 @@
done
fi
AC_ARG_WITH(python-inc-dir, AS_HELP_STRING([--with-python-inc-dir=DIR], [directory with Python include files]),
- [WITH_PYTHON_INCDIR="$withval"], [WITH_PYTHON_INCDIR="`python -c 'from distutils.sysconfig import get_python_inc; print get_python_inc()'`"])
+ [WITH_PYTHON_INCDIR="$withval"], [WITH_PYTHON_INCDIR="`${__PYTHON} -c 'from distutils.sysconfig import get_python_inc; print get_python_inc()'`"])
AC_ARG_WITH(python-lib-dir, AS_HELP_STRING([--with-python-lib-dir=DIR], [directory with Python library]),
- [WITH_PYTHON_LIBDIR="$withval"], [WITH_PYTHON_LIBDIR="`python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'`"])
+ [WITH_PYTHON_LIBDIR="$withval"], [WITH_PYTHON_LIBDIR="`${__PYTHON} -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)'`"])
])
AC_SUBST(WITH_PYTHON_SUBDIR)
AC_SUBST(WITH_PYTHON_SUBPACKAGE)