[Commits] (vajda) added bz2 for Linux

[commits at osafoundation.org]

Commit by: vajda
Modified files:
external/Makefile 1.4 1.5
external/python/.cvsignore 1.1 1.2
external/python/Makefile 1.4 1.5
external/python/xcludes 1.1 1.2

Log message:
added bz2 for Linux


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/external/Makefile.diff?r1=text&tr1=1.4&r2=text&tr2=1.5
http://cvs.osafoundation.org/index.cgi/external/python/.cvsignore.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/external/python/Makefile.diff?r1=text&tr1=1.4&r2=text&tr2=1.5
http://cvs.osafoundation.org/index.cgi/external/python/xcludes.diff?r1=text&tr1=1.1&r2=text&tr2=1.2

Index: external/Makefile
diff -u external/Makefile:1.4 external/Makefile:1.5
--- external/Makefile:1.4	Mon Mar 15 18:23:17 2004
+++ external/Makefile	Tue Mar 16 11:47:17 2004
@@ -1,12 +1,8 @@
 
 ifeq ($(DEBUG),1)
-
 SNAP=debug
-
 else
-
 SNAP=release
-
 endif
 
 SYSTEMS=persistence/db \
@@ -27,6 +23,7 @@
 
 SOURCES=persistence/db/db-4.2.52.tar.gz \
         python/Python-2.3.3.tgz \
+        python/bzip2-1.0.2.tar.gz \
         epydoc/epydoc-2.0.tar.gz \
         wx/wxpython.tar.gz \
         persistence/xerces-c/xerces-c-src2_4_0.tar.gz \

Index: external/python/.cvsignore
diff -u external/python/.cvsignore:1.1 external/python/.cvsignore:1.2
--- external/python/.cvsignore:1.1	Mon Mar 15 11:48:53 2004
+++ external/python/.cvsignore	Tue Mar 16 11:47:18 2004
@@ -1,2 +1,3 @@
 *.gz *.tgz
 Python-*
+bzip2-*

Index: external/python/Makefile
diff -u external/python/Makefile:1.4 external/python/Makefile:1.5
--- external/python/Makefile:1.4	Mon Mar 15 22:10:50 2004
+++ external/python/Makefile	Tue Mar 16 11:47:18 2004
@@ -1,5 +1,6 @@
 
 VERSION=2.3.3
+BZIP2VERSION=1.0.2
 PYTHON=$(BUILD_ROOT)/python
 SRC=$(PYTHON)/Python-$(VERSION)
 OS=$(shell uname)
@@ -44,13 +45,22 @@
                   $(SNAP)/Library/Frameworks/Python.framework \
             -X $(PYTHON)/xcludes
 
+expand: Python-$(VERSION).tgz
+	tar xvzf Python-$(VERSION).tgz
+
 else
 
 $(SRC)/$(BUILD)/Makefile:
 	cd $(SRC); mkdir -p $(BUILD); cd $(BUILD); \
 	../configure --prefix=$(PREFIX) $(CONF_DBG)
 
-build: apply
+bz2: bzip2-$(BZIP2VERSION)/libbz2.a
+	cd bzip2-$(BZIP2VERSION); \
+        make libbz2.a; \
+        install libbz2.a $(PREFIX)/lib; \
+        install bzlib.h $(PREFIX)/include
+
+build: bz2 apply
 	cd $(SRC)/$(BUILD); \
 	$(MAKE) DB=$(PREFIX)/db $(COMP_OPT) install
 
@@ -60,15 +70,15 @@
                   $(SNAP)/bin/idle $(SNAP)/bin/python* $(SNAP)/lib/python* \
             -X $(PYTHON)/xcludes
 
+expand: Python-$(VERSION).tgz
+	tar xvzf Python-$(VERSION).tgz; \
+        tar xvzf bzip2-$(BZIP2VERSION).tar.gz
+
 endif
 
 
 apply: $(SRC)/$(BUILD)/Makefile patches
 	patch -Nup0 < patches; echo ok
-
-expand: Python-$(VERSION).tgz
-	tar xvzf Python-$(VERSION).tgz
-
 
 clean:
 	cd $(SRC); rm -rf $(BUILD)

Index: external/python/xcludes
diff -u external/python/xcludes:1.1 external/python/xcludes:1.2
--- external/python/xcludes:1.1	Mon Mar 15 18:23:22 2004
+++ external/python/xcludes	Tue Mar 16 11:47:18 2004
@@ -1 +1,2 @@
 site-packages
+test