svn commit: r358029 - in head/lang/python34: . files
Antoine Brodin
antoine at FreeBSD.org
Mon Jun 16 17:46:42 UTC 2014
Author: antoine
Date: Mon Jun 16 17:46:41 2014
New Revision: 358029
URL: http://svnweb.freebsd.org/changeset/ports/358029
QAT: https://qat.redports.org/buildarchive/r358029/
Log:
- Create symlinks for non-ABI-suffixed python*-config and ABI-suffixed python-*.pc
- Fix DISABLED_EXTENSIONS extension patch, autoconf is not used so configure has to be patched
Phabric: D225
Reviewed by: koobs
Modified:
head/lang/python34/Makefile
head/lang/python34/files/patch-Makefile.pre.in
head/lang/python34/files/patch-issue20210
head/lang/python34/pkg-plist
Modified: head/lang/python34/Makefile
==============================================================================
--- head/lang/python34/Makefile Mon Jun 16 17:39:39 2014 (r358028)
+++ head/lang/python34/Makefile Mon Jun 16 17:46:41 2014 (r358029)
@@ -3,6 +3,7 @@
PORTNAME= python34
PORTVERSION= 3.4.1
+PORTREVISION= 1
CATEGORIES= lang python ipv6
MASTER_SITES= PYTHON
MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR}
@@ -80,6 +81,8 @@ ABIFLAGS:= d${ABIFLAGS}
.if !empty(ABIFLAGS)
PLIST_FILES+= bin/python%%VER%%%%ABI%%
+PLIST_FILES+= bin/python%%VER%%%%ABI%%-config
+PLIST_FILES+= libdata/pkgconfig/python-%%VER%%%%ABI%%.pc
.endif
.if ${ARCH} == sparc64
Modified: head/lang/python34/files/patch-Makefile.pre.in
==============================================================================
--- head/lang/python34/files/patch-Makefile.pre.in Mon Jun 16 17:39:39 2014 (r358028)
+++ head/lang/python34/files/patch-Makefile.pre.in Mon Jun 16 17:46:41 2014 (r358029)
@@ -6,8 +6,12 @@
# Submitted by: antoine@ (r350207)
# TODO: Upstream
---- ./Makefile.pre.in.orig 2014-03-17 13:31:30.000000000 +1100
-+++ ./Makefile.pre.in 2014-04-06 18:21:28.147616242 +1000
+# Description: Create symlinks for non-ABI-suffixed python*-config and ABI-suffixed python-*.pc
+# Submitted by: antoine@ (r358029)
+# TODO: Upstream
+
+--- ./Makefile.pre.in.orig 2014-05-19 05:19:39.000000000 +0000
++++ ./Makefile.pre.in 2014-06-15 12:12:17.000000000 +0000
@@ -70,18 +70,15 @@
OPT= @OPT@
BASECFLAGS= @BASECFLAGS@
@@ -30,7 +34,20 @@
NO_AS_NEEDED= @NO_AS_NEEDED@
LDLAST= @LDLAST@
SGI_ABI= @SGI_ABI@
-@@ -1314,8 +1311,8 @@
+@@ -1065,12 +1062,6 @@
+ else true; \
+ fi
+ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python3$(EXE))
+- -if test "$(VERSION)" != "$(LDVERSION)"; then \
+- rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \
+- (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \
+- rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \
+- (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \
+- fi
+ -rm -f $(DESTDIR)$(BINDIR)/python3-config
+ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python3-config)
+ -rm -f $(DESTDIR)$(LIBPC)/python3.pc
+@@ -1314,8 +1305,8 @@
if test "$(SHLIB_SUFFIX)" = .dll; then \
$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \
else \
@@ -40,3 +57,16 @@
fi; \
else \
echo Skip install of $(LIBRARY) - use make frameworkinstall; \
+@@ -1333,6 +1324,12 @@
+ $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh
+ $(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py
+ $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(LDVERSION)-config
++ -if test "$(VERSION)" != "$(LDVERSION)"; then \
++ rm -f $(DESTDIR)$(BINDIR)/python$(VERSION)-config; \
++ (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(LDVERSION)-config python$(VERSION)-config); \
++ rm -f $(DESTDIR)$(LIBPC)/python-$(LDVERSION).pc; \
++ (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python-$(LDVERSION).pc); \
++ fi
+ @if [ -s Modules/python.exp -a \
+ "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \
+ echo; echo "Installing support files for building shared extension modules on AIX:"; \
Modified: head/lang/python34/files/patch-issue20210
==============================================================================
--- head/lang/python34/files/patch-issue20210 Mon Jun 16 17:39:39 2014 (r358028)
+++ head/lang/python34/files/patch-issue20210 Mon Jun 16 17:46:41 2014 (r358029)
@@ -42,6 +42,16 @@
# Check for use of the system expat library
AC_MSG_CHECKING(for --with-system-expat)
AC_ARG_WITH(system_expat,
+--- ./configure.orig 2014-05-19 05:19:40.000000000 +0000
++++ ./configure 2014-06-15 12:27:03.000000000 +0000
+@@ -650,6 +650,7 @@
+ TCLTK_LIBS
+ TCLTK_INCLUDES
+ LIBFFI_INCLUDEDIR
++DISABLED_EXTENSIONS
+ PKG_CONFIG
+ SHLIBS
+ CFLAGSFORSHARED
--- ./setup.py.orig 2014-03-24 22:48:48.495472513 +1100
+++ ./setup.py 2014-03-24 22:49:20.076122201 +1100
@@ -33,7 +33,10 @@
Modified: head/lang/python34/pkg-plist
==============================================================================
--- head/lang/python34/pkg-plist Mon Jun 16 17:39:39 2014 (r358028)
+++ head/lang/python34/pkg-plist Mon Jun 16 17:46:41 2014 (r358029)
@@ -2,7 +2,7 @@ bin/2to3-%%VER%%
bin/idle%%VER%%
bin/pydoc%%VER%%
bin/python%%VER%%
-bin/python%%VER%%%%ABI%%-config
+bin/python%%VER%%-config
bin/pyvenv-%%VER%%
%%PYTHON_INCLUDEDIR%%%%ABI%%/Python-ast.h
%%PYTHON_INCLUDEDIR%%%%ABI%%/Python.h
More information about the svn-ports-all
mailing list