1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00

- Unbreak builds after the lang/python27 update (r363790)

Exp-run:	192242, 192244
This commit is contained in:
Marcus von Appen 2014-08-02 07:01:53 +00:00
parent d76fe51a14
commit a38c833874
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=363792
8 changed files with 6 additions and 75 deletions

View File

@ -1,11 +0,0 @@
--- src/pl/plpython/Makefile.orig Fri Nov 19 20:23:01 2004
+++ src/pl/plpython/Makefile Tue Dec 28 23:32:16 2004
@@ -9,7 +9,7 @@
# shared library. Since there is no official way to determine this
# (at least not in pre-2.3 Python), we see if there is a file that is
# named like a shared library.
-ifneq (,$(wildcard $(python_libdir)/libpython*$(DLSUFFIX)*))
+ifneq (,$(wildcard $(python_libdir)/../../libpython*$(DLSUFFIX)*))
shared_libpython = yes
endif

View File

@ -1,11 +0,0 @@
--- src/pl/plpython/Makefile.orig Fri Nov 19 20:23:01 2004
+++ src/pl/plpython/Makefile Tue Dec 28 23:32:16 2004
@@ -9,7 +9,7 @@
# shared library. Since there is no official way to determine this
# (at least not in pre-2.3 Python), we see if there is a file that is
# named like a shared library.
-ifneq (,$(wildcard $(python_libdir)/libpython*$(DLSUFFIX)*))
+ifneq (,$(wildcard $(python_libdir)/../../libpython*$(DLSUFFIX)*))
shared_libpython = yes
endif

View File

@ -1,11 +0,0 @@
--- src/pl/plpython/Makefile.orig Fri Nov 19 20:23:01 2004
+++ src/pl/plpython/Makefile Tue Dec 28 23:32:16 2004
@@ -9,7 +9,7 @@
# shared library. Since there is no official way to determine this
# (at least not in pre-2.3 Python), we see if there is a file that is
# named like a shared library.
-ifneq (,$(wildcard $(python_libdir)/libpython*$(DLSUFFIX)*))
+ifneq (,$(wildcard $(python_libdir)/../../libpython*$(DLSUFFIX)*))
shared_libpython = yes
endif

View File

@ -1,11 +0,0 @@
--- src/pl/plpython/Makefile.orig Fri Nov 19 20:23:01 2004
+++ src/pl/plpython/Makefile Tue Dec 28 23:32:16 2004
@@ -9,7 +9,7 @@
# shared library. Since there is no official way to determine this
# (at least not in pre-2.3 Python), we see if there is a file that is
# named like a shared library.
-ifneq (,$(wildcard $(python_libdir)/libpython*$(DLSUFFIX)*))
+ifneq (,$(wildcard $(python_libdir)/../../libpython*$(DLSUFFIX)*))
shared_libpython = yes
endif

View File

@ -1,11 +0,0 @@
--- src/pl/plpython/Makefile.orig 2013-05-06 22:57:06.000000000 +0200
+++ src/pl/plpython/Makefile 2013-05-10 19:50:09.000000000 +0200
@@ -15,7 +15,7 @@
ifeq (1,$(python_enable_shared))
shared_libpython = yes
else
-ifneq (,$(wildcard $(python_libdir)/libpython*$(DLSUFFIX)*))
+ifneq (,$(wildcard $(python_libdir)/../../libpython*$(DLSUFFIX)*))
shared_libpython = yes
endif
endif

View File

@ -1,11 +0,0 @@
--- src/pl/plpython/Makefile.orig 2013-05-06 22:57:06.000000000 +0200
+++ src/pl/plpython/Makefile 2013-05-10 19:50:09.000000000 +0200
@@ -15,7 +15,7 @@
ifeq (1,$(python_enable_shared))
shared_libpython = yes
else
-ifneq (,$(wildcard $(python_libdir)/libpython*$(DLSUFFIX)*))
+ifneq (,$(wildcard $(python_libdir)/../../libpython*$(DLSUFFIX)*))
shared_libpython = yes
endif
endif

View File

@ -3,7 +3,7 @@
PORTNAME= libhid
PORTVERSION= 0.2.16
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://alioth.debian.org/frs/download.php/1958/

View File

@ -1,14 +1,11 @@
--- configure.orig 2007-04-26 03:25:25.000000000 +0300
+++ configure 2007-09-04 11:10:38.000000000 +0300
@@ -22784,8 +22784,9 @@
fi
--- configure.orig 2014-08-01 17:07:37.000000000 +0200
+++ configure 2014-08-01 17:08:37.000000000 +0200
@@ -22785,7 +22785,7 @@
PYTHON_LDFLAGS=`$PYTHON -c "from distutils.sysconfig import *; \
- import os; \
import os; \
- print apply(os.path.join, get_config_vars('LIBPL', 'LDLIBRARY'))"`
+ import os; import re; from string import join; \
+ print join(get_config_vars('LDFLAGS')) + ' ' + \
+ re.sub('\.a$', '.so', apply(os.path.join, get_config_vars('LIBPL', 'LDLIBRARY')))"`
+ print apply(os.path.join, get_config_vars('LIBDIR', 'LDLIBRARY'))"`
fi
{ echo "$as_me:$LINENO: result: $PYTHON_LDFLAGS" >&5
echo "${ECHO_T}$PYTHON_LDFLAGS" >&6; }