[csw-devel] SF.net SVN: gar:[21987] csw/mgar/pkg/torque/trunk
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Mon Sep 23 22:26:12 CEST 2013
Revision: 21987
http://gar.svn.sourceforge.net/gar/?rev=21987&view=rev
Author: wahwah
Date: 2013-09-23 20:26:11 +0000 (Mon, 23 Sep 2013)
Log Message:
-----------
torque/trunk: The newest version fails.
Modified Paths:
--------------
csw/mgar/pkg/torque/trunk/Makefile
csw/mgar/pkg/torque/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/torque/trunk/files/0001-Disable-the-broken-lxml2-detection.patch
csw/mgar/pkg/torque/trunk/files/0002-Replace-an-obsolete-macro.patch
csw/mgar/pkg/torque/trunk/files/0003-Hardcode-the-name-of-libxml2-library.patch
Modified: csw/mgar/pkg/torque/trunk/Makefile
===================================================================
--- csw/mgar/pkg/torque/trunk/Makefile 2013-09-23 07:20:16 UTC (rev 21986)
+++ csw/mgar/pkg/torque/trunk/Makefile 2013-09-23 20:26:11 UTC (rev 21987)
@@ -2,16 +2,28 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
+# ! still fails:
+# checking for on_exit... no
+# configure: error: Must have atexit() or on_exit()
+
NAME = torque
-VERSION = 3.0.2
+VERSION = 4.2.5
GARTYPE = v2
DESCRIPTION = Batch job scheduling system
-MASTER_SITES += http://www.adaptivecomputing.com/resources/downloads/torque/
+# Their download process is broken. Our scheme won't work. This is the URL for the 4.2.5 version:
+# http://www.adaptivecomputing.com/index.php?wpfb_dl=1677
+# But the file downloaded has a different name, and only downloads after a HTTP redirect.
+
+# MASTER_SITES += http://adaptive.wpengine.com/resources/downloads/torque/
DISTFILES += $(DISTNAME).tar.gz
-PATCHFILES += 0001-daemonize-function-prototype.patch
+# PATCHFILES += 0001-daemonize-function-prototype.patch
+PATCHFILES += 0001-Disable-the-broken-lxml2-detection.patch
+PATCHFILES += 0002-Replace-an-obsolete-macro.patch
+PATCHFILES += 0003-Hardcode-the-name-of-libxml2-library.patch
+
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --with-server-home
@@ -20,10 +32,19 @@
# CSWtk 8.5 is only available on Solaris 10
PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
-VENDOR_URL = http://www.clusterresources.com/products/torque-resource-manager.php
+VENDOR_URL = http://www.adaptivecomputing.com/products/open-source/torque/
LICENSE = PBS_License_2.5.txt
+# Their libxml2 detection is broken. There is a custom sed expression that is
+# supposed to filter the output from libxml2-config, but it doesn't work.
+BUILD_DEP_PKGS += CSWlibxml2-dev
+BUILD_DEP_PKGS += CSWlibssl-dev
+# BUILD_DEP_PKGS += CSWautoconf
+# BUILD_DEP_PKGS += CSWautomake
+# BUILD_DEP_PKGS += CSWlibtool
+# BUILD_DEP_PKGS += CSWpkgconfig
+
PACKAGES = CSWtorque
SPKG_DESC_CSWtorque = $(DESCRIPTION)
RUNTIME_DEP_PKGS_CSWtorque-dev += CSWlibtorque2
@@ -51,3 +72,7 @@
include gar/category.mk
PATH := /opt/csw/gnu:$(PATH)
+
+# pre-configure:
+# cd $(WORKSRC); autoreconf -fi
+# $(MAKECOOKIE)
Modified: csw/mgar/pkg/torque/trunk/checksums
===================================================================
--- csw/mgar/pkg/torque/trunk/checksums 2013-09-23 07:20:16 UTC (rev 21986)
+++ csw/mgar/pkg/torque/trunk/checksums 2013-09-23 20:26:11 UTC (rev 21987)
@@ -1 +1 @@
-a2f008c7eeffcb3a0721fbb252397936 torque-3.0.2.tar.gz
+1e5053efe77090c55529210855af47a0 torque-4.2.5.tar.gz
Added: csw/mgar/pkg/torque/trunk/files/0001-Disable-the-broken-lxml2-detection.patch
===================================================================
--- csw/mgar/pkg/torque/trunk/files/0001-Disable-the-broken-lxml2-detection.patch (rev 0)
+++ csw/mgar/pkg/torque/trunk/files/0001-Disable-the-broken-lxml2-detection.patch 2013-09-23 20:26:11 UTC (rev 21987)
@@ -0,0 +1,50 @@
+From d212de7e660a354ce0e214cbc7bf99d2d2ceda1a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= <maciej at opencsw.org>
+Date: Mon, 23 Sep 2013 20:43:10 +0100
+Subject: [PATCH] Disable the broken -lxml2 detection
+
+The xml2-config utility returns not just "-lxml2" like on Ubuntu, but instead it outputs this:
+
+-L/opt/csw/lib -R/opt/csw/lib -lxml2 -lz -lpthread -liconv -lm -lsocket -lnsl
+
+...and so the sed expression fails to extract the right information.
+---
+ configure | 2 +-
+ configure.ac | 8 +++++++-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 364455e..2b00e82 100755
+--- a/configure
++++ b/configure
+@@ -17841,7 +17841,7 @@ as_val=`eval 'as_val=${'$as_ac_Lib'}
+ #define `$as_echo "HAVE_LIB${xmlLib}" | $as_tr_cpp` 1
+ _ACEOF
+
+- LIBS="-l${xmlLib} $LIBS"
++ LIBS="${xmlLib} $LIBS"
+
+ else
+ { { $as_echo "$as_me:$LINENO: error: TORQUE needs libxml2-devel in order to build" >&5
+diff --git a/configure.ac b/configure.ac
+index fbadb19..81dd98d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -749,7 +749,13 @@ AC_CHECK_LIB(crypto, BN_init,
+ dnl
+ dnl we need libxml2
+ dnl
+-xmlLib=`xml2-config --libs | sed 's/-L@<:@^@<:@:space:@:>@@:>@* //g;s/-l//'`
++dnl xmlLib=`xml2-config --libs | sed 's/-L@<:@^@<:@:space:@:>@@:>@* //g;s/-l//'`
++dnl on Solaris:
++dnl -L/opt/csw/lib -R/opt/csw/lib -lxml2 -lz -lpthread -liconv -lm -lsocket -lnsl
++dnl on Ubuntu:
++dnl -lxml2
++dnl so the sed expression doesn't work on Solaris at all.
++xmlLib=xml2
+
+ dnl skip the first two chars because its -l<libname>
+ AC_CHECK_LIB(${xmlLib}, xmlGetProp,
+--
+1.8.3.4
+
Added: csw/mgar/pkg/torque/trunk/files/0002-Replace-an-obsolete-macro.patch
===================================================================
--- csw/mgar/pkg/torque/trunk/files/0002-Replace-an-obsolete-macro.patch (rev 0)
+++ csw/mgar/pkg/torque/trunk/files/0002-Replace-an-obsolete-macro.patch 2013-09-23 20:26:11 UTC (rev 21987)
@@ -0,0 +1,26 @@
+From 81c917d4af507aad4678c91b1cdaa8d0c72a625c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= <maciej at opencsw.org>
+Date: Mon, 23 Sep 2013 20:48:59 +0100
+Subject: [PATCH] Replace an obsolete macro
+
+AM_CONFIG_HEADER -> AM_CONFIG_HEADERS
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 81dd98d..5494755 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -79,7 +79,7 @@ gccwarnings=yes
+ dnl Instead of putting a long list of defines on the command line
+ dnl for each compile, use a file called "pbs_config.h" that will
+ dnl be created in the include directory.
+-AM_CONFIG_HEADER([src/include/pbs_config.h])
++AC_CONFIG_HEADERS([src/include/pbs_config.h])
+
+ dnl
+ dnl Find our git revision hash for program outputs
+--
+1.8.3.4
+
Added: csw/mgar/pkg/torque/trunk/files/0003-Hardcode-the-name-of-libxml2-library.patch
===================================================================
--- csw/mgar/pkg/torque/trunk/files/0003-Hardcode-the-name-of-libxml2-library.patch (rev 0)
+++ csw/mgar/pkg/torque/trunk/files/0003-Hardcode-the-name-of-libxml2-library.patch 2013-09-23 20:26:11 UTC (rev 21987)
@@ -0,0 +1,26 @@
+From 76b05d335f1e06e252a630dfac81b2c6992fba62 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Maciej=20Blizi=C5=84ski?= <maciej at opencsw.org>
+Date: Mon, 23 Sep 2013 21:19:20 +0100
+Subject: [PATCH] Hardcode the name of libxml2 library.
+
+---
+ configure | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 2b00e82..70eeafd 100755
+--- a/configure
++++ b/configure
+@@ -17763,7 +17763,8 @@ fi
+
+
+
+-xmlLib=`xml2-config --libs | sed 's/-L[^[:space:]]* //g;s/-l//'`
++# xmlLib=`xml2-config --libs | sed 's/-L[^[:space:]]* //g;s/-l//'`
++xmlLib=xml2
+
+
+ as_ac_Lib=`$as_echo "ac_cv_lib_${xmlLib}''_xmlGetProp" | $as_tr_sh`
+--
+1.8.3.4
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list