Fix unprivileged builddiff -r1.1.1.1 -r1.2 pkgsrc/lang/python27/buildlink3.mk
(adam)
@@ -1,24 +1,24 @@ | @@ -1,24 +1,24 @@ | |||
1 | # $NetBSD: buildlink3.mk,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $ | 1 | # $NetBSD: buildlink3.mk,v 1.2 2011/02/22 10:50:37 adam Exp $ | |
2 | 2 | |||
3 | BUILDLINK_TREE+= python27 | 3 | BUILDLINK_TREE+= python27 | |
4 | 4 | |||
5 | .if !defined(PYTHON27_BUILDLINK3_MK) | 5 | .if !defined(PYTHON27_BUILDLINK3_MK) | |
6 | PYTHON27_BUILDLINK3_MK:= | 6 | PYTHON27_BUILDLINK3_MK:= | |
7 | 7 | |||
8 | BUILDLINK_API_DEPENDS.python27+= python27>=2.7 | 8 | BUILDLINK_API_DEPENDS.python27+= python27>=2.7 | |
9 | BUILDLINK_PKGSRCDIR.python27?= ../../lang/python27 | 9 | BUILDLINK_PKGSRCDIR.python27?= ../../lang/python27 | |
10 | 10 | |||
11 | . if defined(BUILDLINK_DEPMETHOD.python) | 11 | .if defined(BUILDLINK_DEPMETHOD.python) | |
12 | BUILDLINK_DEPMETHOD.python27?= ${BUILDLINK_DEPMETHOD.python} | 12 | BUILDLINK_DEPMETHOD.python27?= ${BUILDLINK_DEPMETHOD.python} | |
13 | . endif | 13 | .endif | |
14 | 14 | |||
15 | BUILDLINK_INCDIRS.python27+= include/python2.7 | 15 | BUILDLINK_INCDIRS.python27+= include/python2.7 | |
16 | BUILDLINK_LIBDIRS.python27+= lib/python2.7/config | 16 | BUILDLINK_LIBDIRS.python27+= lib/python2.7/config | |
17 | BUILDLINK_TRANSFORM+= l:python:python2.7 | 17 | BUILDLINK_TRANSFORM+= l:python:python2.7 | |
18 | 18 | |||
19 | .include "../../mk/dlopen.buildlink3.mk" | 19 | .include "../../mk/dlopen.buildlink3.mk" | |
20 | .include "../../mk/pthread.buildlink3.mk" | 20 | .include "../../mk/pthread.buildlink3.mk" | |
21 | .include "../../devel/gettext-lib/buildlink3.mk" | 21 | .include "../../devel/gettext-lib/buildlink3.mk" | |
22 | .endif # PYTHON27_BUILDLINK3_MK | 22 | .endif # PYTHON27_BUILDLINK3_MK | |
23 | 23 | |||
24 | BUILDLINK_TREE+= -python27 | 24 | BUILDLINK_TREE+= -python27 |
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | $NetBSD: distinfo,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $ | 1 | $NetBSD: distinfo,v 1.2 2011/02/22 10:50:37 adam Exp $ | |
2 | 2 | |||
3 | SHA1 (Python-2.7.1.tar.bz2) = fbe1894322ff91b80726e269c97454f4129fc2a3 | 3 | SHA1 (Python-2.7.1.tar.bz2) = fbe1894322ff91b80726e269c97454f4129fc2a3 | |
4 | RMD160 (Python-2.7.1.tar.bz2) = 3ce59305f6cd3fb320a53771d0ea01ec0687005f | 4 | RMD160 (Python-2.7.1.tar.bz2) = 3ce59305f6cd3fb320a53771d0ea01ec0687005f | |
5 | Size (Python-2.7.1.tar.bz2) = 11722546 bytes | 5 | Size (Python-2.7.1.tar.bz2) = 11722546 bytes | |
6 | SHA1 (patch-aa) = 990e4025bb6a37715e1f5df1831499f0ab08acfa | 6 | SHA1 (patch-aa) = 990e4025bb6a37715e1f5df1831499f0ab08acfa | |
7 | SHA1 (patch-ab) = 8c44f60d9ed0babb107bc4643b0437e2dd55d03a | 7 | SHA1 (patch-ab) = 8c44f60d9ed0babb107bc4643b0437e2dd55d03a | |
8 | SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec | 8 | SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec | |
9 | SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6 | 9 | SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6 | |
10 | SHA1 (patch-ah) = 8e9ee44c7a054f1387b6d8ef8dbe9c1b8dc8d891 | 10 | SHA1 (patch-ah) = 8e9ee44c7a054f1387b6d8ef8dbe9c1b8dc8d891 | |
11 | SHA1 (patch-al) = 2c6a578b62dfba45b2ba01a6b004f1d8feee0fe2 | 11 | SHA1 (patch-al) = 2c6a578b62dfba45b2ba01a6b004f1d8feee0fe2 | |
12 | SHA1 (patch-am) = c0a72af7c9827a9107fb7d1862febd487b9b5c83 | 12 | SHA1 (patch-am) = c0a72af7c9827a9107fb7d1862febd487b9b5c83 | |
13 | SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca | 13 | SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca | |
14 | SHA1 (patch-ao) = 2061473e5e672b4cc38d91c5d8f885cb361a35b3 | 14 | SHA1 (patch-ao) = 2061473e5e672b4cc38d91c5d8f885cb361a35b3 | |
15 | SHA1 (patch-au) = 4eba74a2305e5e49eb5797d9623a262c47096453 | 15 | SHA1 (patch-au) = 700dc128833af755f3ea08c4db79c127453b12e6 | |
16 | SHA1 (patch-av) = a14eaf4d5db6fc3b79ed896fbfcc34ca98051af2 | 16 | SHA1 (patch-av) = a14eaf4d5db6fc3b79ed896fbfcc34ca98051af2 | |
17 | SHA1 (patch-aw) = 15652e241f371a22c7300f46771825ea74514fa0 | 17 | SHA1 (patch-aw) = 15652e241f371a22c7300f46771825ea74514fa0 | |
18 | SHA1 (patch-ax) = b3a69107d3abbc8476ce79fb05aa8c9f293896a2 | 18 | SHA1 (patch-ax) = b3a69107d3abbc8476ce79fb05aa8c9f293896a2 |
@@ -1,14 +1,23 @@ | @@ -1,14 +1,23 @@ | |||
1 | $NetBSD: patch-au,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $ | 1 | $NetBSD: patch-au,v 1.2 2011/02/22 10:50:38 adam Exp $ | |
2 | 2 | |||
3 | --- Makefile.pre.in.orig 2010-04-12 00:10:46.000000000 +0000 | 3 | --- Makefile.pre.in.orig 2010-04-12 00:10:46.000000000 +0000 | |
4 | +++ Makefile.pre.in | 4 | +++ Makefile.pre.in | |
5 | @@ -444,7 +444,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py | |||
6 | ||||
7 | SRC_GDB_HOOKS=$(srcdir)/Tools/gdb/libpython.py | |||
8 | $(BUILDPYTHON)-gdb.py: $(SRC_GDB_HOOKS) | |||
9 | - $(INSTALL_DATA) $(SRC_GDB_HOOKS) $(BUILDPYTHON)-gdb.py | |||
10 | + cp $(SRC_GDB_HOOKS) $(BUILDPYTHON)-gdb.py | |||
11 | ||||
12 | # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary | |||
13 | # minimal framework (not including the Lib directory and such) in the current | |||
5 | @@ -815,7 +815,8 @@ altbininstall: $(BUILDPYTHON) | 14 | @@ -815,7 +815,8 @@ altbininstall: $(BUILDPYTHON) | |
6 | (cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) $(LDLIBRARY)) \ | 15 | (cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) $(LDLIBRARY)) \ | |
7 | fi \ | 16 | fi \ | |
8 | fi; \ | 17 | fi; \ | |
9 | - else true; \ | 18 | - else true; \ | |
10 | + elif test -f $(INSTSONAME); then \ | 19 | + elif test -f $(INSTSONAME); then \ | |
11 | + $(INSTALL_SHARED) $(INSTSONAME) $(DESTDIR)$(LIBDIR); \ | 20 | + $(INSTALL_SHARED) $(INSTSONAME) $(DESTDIR)$(LIBDIR); \ | |
12 | fi | 21 | fi | |
13 | 22 | |||
14 | # Install the manual page | 23 | # Install the manual page |