FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Merge pull request #54 from jjhelmus/jh_historic_py14 · wolfv/python-feedstock@cc1fb40 · GitHub

/ python-feedstock Public
forked from conda-forge/python-feedstock

Commit cc1fb40

Browse files
jjhelmus
authored
Merge pull request conda-forge#54 from jjhelmus/jh_historic_py14
Python 1.4
2 parents 65e6b03 + 9ffdd49 commit cc1fb40

6 files changed

Lines changed: 61 additions & 46 deletions

File tree

‎recipe/Makefile.in_python_path.patch‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
--- Makefile.in.orig 2016-07-02 11:14:59.000000000 -0500
2+
+++ Makefile.in 2016-07-02 11:33:23.000000000 -0500
3+
@@ -188,7 +188,7 @@
4+
else true; \
5+
fi; \
6+
done
7+
- $(INSTALL_PROGRAM) python $(BINDIR)/python$(VERSION)
8+
+ $(INSTALL_PROGRAM) Python/python $(BINDIR)/python$(VERSION)
9+
10+
# Install the manual page
11+
maninstall:
12+
@@ -262,13 +262,13 @@
13+
done; \
14+
done
15+
PYTHONPATH=$(LIBDEST) \
16+
- ./python $(LIBDEST)/compileall.py $(LIBDEST)
17+
+ ./Python/python $(LIBDEST)/compileall.py $(LIBDEST)
18+
19+
# Create the MACHDEP source directory, if one wasn't distributed..
20+
$(srcdir)/Lib/$(MACHDEP):
21+
mkdir $(srcdir)/Lib/$(MACHDEP)
22+
cp $(srcdir)/Lib/generic/regen $(srcdir)/Lib/$(MACHDEP)/regen
23+
- export PATH; PATH="`pwd`:$$PATH"; \
24+
+ export PATH; PATH="`pwd`:`pwd`/Python:$$PATH"; \
25+
export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \
26+
cd $(srcdir)/Lib/$(MACHDEP); ./regen
27+

‎recipe/build.sh‎

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,10 @@
11
#!/bin/bash
22

33
if [ `uname` == Darwin ]; then
4-
5-
# The OS X filesystem is case insensitive which causes various problems
6-
# during the build.
7-
84
# Compile with a no checking of the return type checking, note that
95
# CFLAGS cannot be used here.
106
export CC="gcc -Wno-return-type"
11-
./configure --prefix=$PREFIX
12-
make
13-
14-
# The python binary should be copied out of the Python directory during the
15-
# make step but this silently fails as the name conflicts with the existing
16-
# Python directory.
17-
# Perform the install manually from the Python directory
18-
mkdir -p $PREFIX/bin
19-
install -c Python/python $PREFIX/bin/python
20-
21-
# make libinstall compiles the standard library with the python binary in
22-
# the root directory, move it there after making room by removing the
23-
# Python directory
24-
cp Python/python python_temp
25-
rm -rf Python
26-
mv python_temp python
27-
mkdir -p $PREFIX/lib/python
28-
make libinstall
29-
fi
30-
31-
if [ `uname` == Linux ]; then
32-
./configure --prefix=$PREFIX
33-
make
34-
make install
35-
# make libinstall does not create the /lib/python directory so do it
36-
# explicitly
37-
mkdir -p $PREFIX/lib/python
38-
make libinstall
397
fi
8+
./configure --prefix=$PREFIX
9+
make
10+
make install

‎recipe/fileobject_getline.patch‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- Objects/fileobject.c.orig 2016-07-02 08:50:48.000000000 -0500
2-
+++ Objects/fileobject.c 2016-07-02 08:51:08.000000000 -0500
3-
@@ -417,7 +417,7 @@
1+
--- Objects/fileobject.c.orig 2016-07-02 10:53:04.000000000 -0500
2+
+++ Objects/fileobject.c 2016-07-02 10:53:19.000000000 -0500
3+
@@ -424,7 +424,7 @@
44
*/
55

66
static object *
@@ -9,7 +9,7 @@
99
fileobject *f;
1010
int n;
1111
{
12-
@@ -538,7 +538,7 @@
12+
@@ -545,7 +545,7 @@
1313
}
1414
if (((fileobject*)f)->f_fp == NULL)
1515
return err_closed();
@@ -18,7 +18,7 @@
1818
}
1919

2020
/* Python method */
21-
@@ -563,7 +563,7 @@
21+
@@ -570,7 +570,7 @@
2222
n = 0;
2323
}
2424

@@ -27,7 +27,7 @@
2727
}
2828

2929
static object *
30-
@@ -581,7 +581,7 @@
30+
@@ -588,7 +588,7 @@
3131
if ((list = newlistobject(0)) == NULL)
3232
return NULL;
3333
for (;;) {

‎recipe/meta.yaml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
11
package:
22
name: python
3-
version: 1.3
3+
version: 1.4
44

55
source:
6-
fn: python-1.3.tar.gz
7-
url: http://legacy.python.org/download/releases/src/python-1.3.tar.gz
8-
sha256: 892a12d7360b5e6aed0f6a637f5dbdd4ea9a27ee0e2741337393b1d5711d2d33
6+
fn: python-1.4.tar.gz
7+
url: http://legacy.python.org/download/releases/src/python-1.4.tar.gz
8+
sha256: 6c551f79810ac679a8049fdf04d0c20ace2a7117da3dda2f0020ab692a27f1fb
99
patches:
1010
# Modules/fileobject.c defines a getline function which conflicts with the
1111
# one in stdio.h, rename the function in the file to _getline
1212
- fileobject_getline.patch
13+
# OS X uses a file insensitive filesystem so the python binary is not
14+
# copied out of the Python directory, adjust the Makefile for this
15+
- Makefile.in_python_path.patch # [osx]
1316
# The crypt library needs to be linked when compiling python
1417
- setup.in_lcrypt.patch # [not osx]
18+
# Remove definition of strdup in parsermode.c
19+
- parsermodule.in_no_strdup.patch # [linux]
1520

1621

1722
build:
@@ -24,6 +29,7 @@ build:
2429
test:
2530
commands:
2631
- python -c "import sys; print sys.path"
32+
- python1.4 -c "import sys; print sys.path"
2733
# struct is a compiled module
2834
- python -c "import struct"
2935
# os is a python module, import will fail if sys.path is incorrect

‎recipe/parsermodule.in_no_strdup.patch‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- Modules/parsermodule.c.orig 2016-07-02 17:48:21.000000000 -0500
2+
+++ Modules/parsermodule.c 2016-07-02 17:48:43.000000000 -0500
3+
@@ -34,7 +34,7 @@
4+
* different systems declare it a little differently, and we don't need the
5+
* extra warnings.
6+
*/
7+
-extern char* strdup();
8+
+/* extern char* strdup(); */
9+
10+
11+
/* String constants used to initialize module attributes.

‎recipe/setup.in_lcrypt.patch‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
--- Modules/Setup.in.orig 2016-07-01 15:30:31.899864878 -0500
2-
+++ Modules/Setup.in 2016-07-01 15:30:56.403864596 -0500
3-
@@ -108,7 +108,7 @@
1+
--- Modules/Setup.in.orig 2016-07-02 17:13:35.000000000 -0500
2+
+++ Modules/Setup.in 2016-07-02 17:13:47.000000000 -0500
3+
@@ -127,7 +127,7 @@
44
fcntl fcntlmodule.c # fcntl(2) and ioctl(2)
55
pwd pwdmodule.c # pwd(3)
66
grp grpmodule.c # grp(3)
77
-crypt cryptmodule.c # -lcrypt # crypt(3); needs -lcrypt on some systems
88
+crypt cryptmodule.c -lcrypt # crypt(3); needs -lcrypt on some systems
99
select selectmodule.c # select(2); not on ancient System V
1010
socket socketmodule.c # socket(2); not on ancient System V
11-
11+
errno errnomodule.c # posix (UNIX) errno values

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL