[open-ils-commits] [GIT] Evergreen ILS branch master updated. 7194fde763d6a0047687622df0d1d9aa82ba93da

Evergreen Git git at git.evergreen-ils.org
Sat Sep 10 12:37:51 EDT 2011 

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  7194fde763d6a0047687622df0d1d9aa82ba93da (commit)
       via  c17bef273e0cd1b831592980d9409c915b6a6a2b (commit)
       via  f58565e5daee8986ba601752353b51bbd268ffee (commit)
      from  8dcdb50fbb058fb5341c2a24ba3b5e130a8ccbcb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7194fde763d6a0047687622df0d1d9aa82ba93da
Author: Dan Scott <dscott at laurentian.ca>
Date:   Sat Sep 10 12:36:14 2011 -0400

    Remove references to Fedora 13 and 14
    
    Fedora 13 has not been supported for months, Fedora 14 is about to lose
    support. Simplifies README and prereq installer a bit.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 27d6e85..0812736 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -4,7 +4,7 @@
 #
 # Makefile to install prerequisites for OpenSRF and Evergreen
 #
-# Currently supports Debian (squeeze), Ubuntu (lucid), and Fedora (14).
+# Currently supports Debian (squeeze), Ubuntu (lucid), and Fedora (15).
 # Working towards support of CentOS 5 / RHEL 5.
 # Installs Perl prereqs, libjs with Perl wrapper, libdbi, libdbi-drivers, and libyaz
 #
@@ -13,7 +13,7 @@
 # 	- or -
 # 	make -f Makefile.install ubuntu-lucid
 # 	- or -
-# 	make -f Makefile.install fedora14
+# 	make -f Makefile.install fedora15
 # 	- or -
 # 	make -f Makefile.install centos
 # 	- or -
@@ -272,8 +272,7 @@ centos: install_centos_pgsql centos_like
 rhel: install_redhat_pgsql centos_like
 centos_like: install_centos_rpms install_yaz install_cpan_marc install install_centos_perl create_ld_local install_cpan_safe install_cpan_force
 
-fedora14: install_fedora_rpms install_cpan install_cpan_fedora install_cpan_marc install_js_sm install_cpan_force
-fedora15: fedora14
+fedora15: install_fedora_rpms install_cpan install_cpan_fedora install_cpan_marc install_js_sm install_cpan_force
 
 debian-squeeze: squeeze generic_debian
 squeeze: install_pgsql_client_debs_90  install_extra_debs_squeeze
@@ -309,7 +308,7 @@ install_cpan_force:
 install_cpan_safe: 
 	for m in $(CPAN_MODULES_SAFE); do perl -MCPAN -e "install \"$$m\";"; done
 
-# Install the CPAN modules for Fedora 13
+# Install the CPAN modules for Fedora
 install_cpan_fedora: 
 	for m in $(FEDORA_CPAN); do \
 		echo "force install $$m" | perl -MCPAN -e shell;\
@@ -427,7 +426,7 @@ install_extra_encode:
 
 # ------------------------------------------------------------------
 
-# FEDORA 13
+# FEDORA
 install_fedora_rpms:
 	yum -y update
 	yum -y install $(FEDORA_RPMS)
diff --git a/README b/README
index b9c3eb0..16a83af 100644
--- a/README
+++ b/README
@@ -26,9 +26,6 @@ deb http://backports.debian.org/debian-backports squeeze-backports main contrib
 deb http://archive.ubuntu.com/ubuntu lucid-backports main universe multiverse restricted
 ------------------------------------------------------------------------------
 +
-  * On Fedora 14, follow the http://yum.pgrpms.org/howtoyum.php[instructions
-    in the Yum HOWTO] to enable the PostgreSQL RPM Building Project yum
-    repository.
   * Fedora 15 comes with PostgreSQL 9, so no additional steps are required.
 +
 3. On Debian and Ubuntu, run `aptitude update` to retrieve the new packages
@@ -38,7 +35,7 @@ deb http://archive.ubuntu.com/ubuntu lucid-backports main universe multiverse re
    installer.
 5. Issue the following commands as the root user to install prerequisites
    using the Makefile.install prerequisite installer, substituting
-   `debian-squeeze`, `fedora15`, `fedora14`, `ubuntu-lucid`, `centos`, or
+   `debian-squeeze`, `fedora15`, `ubuntu-lucid`, `centos`, or
    `rhel` for <osname> below:
 +
 [source, bash]

commit c17bef273e0cd1b831592980d9409c915b6a6a2b
Author: Dan Scott <dscott at laurentian.ca>
Date:   Sat Sep 10 12:28:32 2011 -0400

    Refresh dynamic link cache after libjs install
    
    The build of SpiderMonkey can fail if it can't find the freshly
    installed libjs library, so run ldconfig after building libjs to avoid
    that bit o' fun.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index 96b1662..27d6e85 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -342,6 +342,7 @@ install_libjs:
 		cp js/src/Linux_All_DBG.OBJ/*.so $(JS_INSTALL_PREFIX)/lib/ && \
 		cp js/src/Linux_All_DBG.OBJ/*.a $(JS_INSTALL_PREFIX)/lib/; \
 	fi;
+	ldconfig
 
 install_spidermonkey:
 	if [ ! -f $(LIBJS_PERL).tar.gz ]; then wget $(LIBJS_PERL_URL); fi;

commit f58565e5daee8986ba601752353b51bbd268ffee
Author: Dan Scott <dscott at laurentian.ca>
Date:   Sat Sep 10 12:27:41 2011 -0400

    Fix prerequisite install on Fedora 15
    
    The postgresql package shipped in Fedora proper is just called
    'postgresql-devel', so get that right.
    
    Also, try to put 64-bit libraries in the right directory.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/Open-ILS/src/extras/Makefile.install b/Open-ILS/src/extras/Makefile.install
index bb69740..96b1662 100644
--- a/Open-ILS/src/extras/Makefile.install
+++ b/Open-ILS/src/extras/Makefile.install
@@ -180,7 +180,7 @@ FEDORA_RPMS = \
 	perl-Text-CSV \
 	perl-Text-CSV_XS \
 	perl-XML-Writer \
-	postgresql90-devel \
+	postgresql-devel \
 	readline-devel \
 	tcp_wrappers-devel \
 	wget \
@@ -335,8 +335,13 @@ install_libjs:
 	mkdir -p $(JS_INSTALL_PREFIX)/include/js/
 	cp js/src/*.h $(JS_INSTALL_PREFIX)/include/js/
 	cp js/src/*.tbl $(JS_INSTALL_PREFIX)/include/js/
-	cp js/src/Linux_All_DBG.OBJ/*.so $(JS_INSTALL_PREFIX)/lib/
-	cp js/src/Linux_All_DBG.OBJ/*.a $(JS_INSTALL_PREFIX)/lib/
+	if [ ! -z $(FEDORA_64) ]; then \
+		cp js/src/Linux_All_DBG.OBJ/*.so $(JS_INSTALL_PREFIX)/lib64/ && \
+		cp js/src/Linux_All_DBG.OBJ/*.a $(JS_INSTALL_PREFIX)/lib64/; \
+	else \
+		cp js/src/Linux_All_DBG.OBJ/*.so $(JS_INSTALL_PREFIX)/lib/ && \
+		cp js/src/Linux_All_DBG.OBJ/*.a $(JS_INSTALL_PREFIX)/lib/; \
+	fi;
 
 install_spidermonkey:
 	if [ ! -f $(LIBJS_PERL).tar.gz ]; then wget $(LIBJS_PERL_URL); fi;

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/extras/Makefile.install |   23 ++++++++++++++---------
 README                               |    5 +----
 2 files changed, 15 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
Evergreen ILS

More information about the open-ils-commits mailing list