pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/parallel/sge Reinstate patch-source-utilbin_Makefile (...
details: https://anonhg.NetBSD.org/pkgsrc/rev/60ae23a08cf3
branches: trunk
changeset: 602493:60ae23a08cf3
user: markd <markd%pkgsrc.org@localhost>
date: Sun Apr 15 04:07:21 2012 +0000
description:
Reinstate patch-source-utilbin_Makefile (aka patch-ak)
Dont install *.orig files
Fix build on 64bit systems
Fix arch name for Linux
Bump PKGREVISION
diffstat:
parallel/sge/Makefile | 30 +-
parallel/sge/PLIST | 4 +-
parallel/sge/distinfo | 9 +-
parallel/sge/patches/patch-am | 15 +-
parallel/sge/patches/patch-source-utilbin_Makefile | 125 ++++++++++++
parallel/sge/patches/patch-source_3rdparty_sge_depend_def.h | 15 +
6 files changed, 168 insertions(+), 30 deletions(-)
diffs (truncated from 328 to 300 lines):
diff -r f33c15a03c7c -r 60ae23a08cf3 parallel/sge/Makefile
--- a/parallel/sge/Makefile Sun Apr 15 03:51:41 2012 +0000
+++ b/parallel/sge/Makefile Sun Apr 15 04:07:21 2012 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.43 2012/04/07 22:19:13 dholland Exp $
+# $NetBSD: Makefile,v 1.44 2012/04/15 04:07:21 markd Exp $
#
DISTNAME= sge-8.0.0d
PKGNAME= sge-8.0.0.4
+PKGREVISION= 1
CATEGORIES= parallel sysutils
MASTER_SITES= http://arc.liv.ac.uk/downloads/SGE/releases/8.0.0d/
@@ -14,12 +15,11 @@
PKG_DESTDIR_SUPPORT= user-destdir
-# Not 64-bit clean; crashes during build.
-NOT_FOR_PLATFORM= ${LP64PLATFORMS}
-
GNU_CONFIGURE= YES
USE_TOOLS+= gmake perl:run
+MANINSTALL= maninstall catinstall
+
CFLAGS+= -D${UPPER_OPSYS}
CONFIGURE_ENV+= REMOTE=sge
CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q}
@@ -50,8 +50,6 @@
REPLACE_FILES.tclsh= source/dist/util/resources/jsv/jsv.tcl
REPLACE_PERL+= source/dist/util/resources/jsv/jsv.pl
-CHECK_INTERPRETER_SKIP+= sge/ckpt/cpr_* sge/mpi/myrinet/* sge/util/resources/loadsensors/interix-loadsensor.sh
-
.include "../../mk/bsd.prefs.mk"
# SGE_ARCH should match the putput of ${WRKSRC}/source/dist/util/arch
@@ -83,7 +81,7 @@
SGE_BUILDARCH= DARWIN
.elif ${OPSYS} == "Linux"
AIMK+= -no-dump
-SGE_ARCH= lx26-x86
+SGE_ARCH= lx-x86
SGE_BUILDARCH= LINUX86
.else
PKG_FAIL_REASON+= "SGE_ARCH and SGE_BUILDARCH need to be configured for your OS"
@@ -91,9 +89,9 @@
SGE_BUILDARCH?= ${SGE_BUILDARCH_cmd:sh}
# Some hacks to get it properly linked:
-MAKE_ENV+= SGE_ARCH=$(SGE_ARCH) SGE_ROOT=$(SGE_ROOT)
+MAKE_ENV+= SGE_ARCH=${SGE_ARCH} SGE_ROOT=${SGE_ROOT}
-LDFLAGS+= -R${SGE_ROOT}/lib/${SGE_ARCH}
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${SGE_ROOT}/lib/${SGE_ARCH}
BUILDLINK_PASSTHRU_RPATHDIRS+= ${SGE_ROOT}/lib/${SGE_ARCH}
SGE_ROOT= ${PREFIX}/sge
@@ -115,11 +113,12 @@
${ECHO} "set PERL = ${PERL5}" ) > ${WRKSRC}/source/aimk.private
( ${ECHO} "OPENSSLBASE=${SSL_PREFIX}" ; \
${ECHO} "BERKELEYDBBASE=${BUILDLINK_PREFIX.db4}" ) > ${WRKSRC}/source/distinst.private
+ rm ${WRKSRC}/source/dist/util/*.orig
SUBST_CLASSES+= paths
SUBST_STAGE.paths= post-patch
SUBST_FILES.paths= source/dist/util/arch_variables
-SUBST_SED.paths= -e 's;@rcd_dir@;${RCD_SCRIPTS_DIR};'
+SUBST_SED.paths= -e 's;@rcd_dir@;${RCD_SCRIPTS_DIR};'
do-configure:
.for __prog__ in qmake qtcsh
@@ -131,22 +130,25 @@
.endfor
do-build:
- cd ${WRKSRC}/source && ${AIMK} -no-java -no-jni -only-depend
+ cd ${WRKSRC}/source && ${AIMK} -no-java -no-jni -no-hwloc -only-depend
cd ${WRKSRC}/source && ${SETENV} ${MAKE_ENV} ./scripts/zerodepend
- cd ${WRKSRC}/source && ${AIMK} -no-java -no-jni -no-qmake -no-qtcsh depend
- cd ${WRKSRC}/source && ${AIMK} -no-java -no-jni
- cd ${WRKSRC}/source && ${AIMK} -no-java -no-jni -man -sunman
+ cd ${WRKSRC}/source && ${AIMK} -no-java -no-jni -no-hwloc -no-qmake -no-qtcsh depend
+ cd ${WRKSRC}/source && ${AIMK} -no-java -no-jni -no-hwloc
+ cd ${WRKSRC}/source && ${AIMK} -no-java -no-jni -no-hwloc -man
CHECK_INTERPRETER_SKIP= sge/bin/process-scheduler-log \
sge/bin/qsched \
sge/bin/status \
+ sge/ckpt/cpr_* \
sge/examples/drmaa/ruby/* \
sge/hadoop/pestart.sh \
sge/hadoop/pestop.sh \
sge/hadoop/setup.pl \
sge/hadoop/wait.sh \
+ sge/mpi/myrinet/* \
sge/util/resources/drmaa4ruby/* \
sge/util/resources/drmaa4ruby/samples/* \
+ sge/util/resources/loadsensors/interix-loadsensor.sh \
sge/util/resources/wrappers/rshd-wrapper
do-install:
diff -r f33c15a03c7c -r 60ae23a08cf3 parallel/sge/PLIST
--- a/parallel/sge/PLIST Sun Apr 15 03:51:41 2012 +0000
+++ b/parallel/sge/PLIST Sun Apr 15 04:07:21 2012 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2012/03/20 17:07:43 asau Exp $
+@comment $NetBSD: PLIST,v 1.8 2012/04/15 04:07:21 markd Exp $
bin/qacct
bin/qalter
bin/qconf
@@ -548,7 +548,6 @@
sge/start_gui_installer
sge/util/arch
sge/util/arch_variables
-sge/util/arch_variables.orig
sge/util/certtool.sh
sge/util/create_settings.sh
sge/util/dl.csh
@@ -707,7 +706,6 @@
sge/util/resources/wrappers/rshd-wrapper
sge/util/rmiconsole.policy
sge/util/setfileperm.sh
-sge/util/setfileperm.sh.orig
sge/util/sgeCA/renew_all_certs.csh
sge/util/sgeCA/sge_ca
sge/util/sgeCA/sge_ca.cnf
diff -r f33c15a03c7c -r 60ae23a08cf3 parallel/sge/distinfo
--- a/parallel/sge/distinfo Sun Apr 15 03:51:41 2012 +0000
+++ b/parallel/sge/distinfo Sun Apr 15 04:07:21 2012 +0000
@@ -1,16 +1,15 @@
-$NetBSD: distinfo,v 1.14 2012/03/20 17:07:43 asau Exp $
+$NetBSD: distinfo,v 1.15 2012/04/15 04:07:21 markd Exp $
SHA1 (sge-8.0.0d.tar.gz) = e7500bbeec4075d054410f7465011efb61e93def
RMD160 (sge-8.0.0d.tar.gz) = aa83db459f4bbbebd7d2cc81290b7b8cb0818210
Size (sge-8.0.0d.tar.gz) = 12289130 bytes
SHA1 (patch-ad) = 004600f060b5fcacd91ba68808686c0a679889f6
SHA1 (patch-ag) = 57eb4296e531f3a47b95c8842e0db0575870dcf0
-SHA1 (patch-am) = bbb87319c4dcb893be3757feec2c8cf69fe7ae61
+SHA1 (patch-am) = 1d367d541ec68d1c5618e3c594c5ce2db88a277e
SHA1 (patch-at) = d29e29e4915f8015618a4ebc5b17231c2bcc4bf5
SHA1 (patch-bd) = aae1bdccfb81712c504b3add8b9728a2bcf3d1dd
SHA1 (patch-bl) = f04f92c1a1c69443e9336f9fcbe7d988001f6681
SHA1 (patch-bm) = 524268d07060fac00a2648e7c63377f965377c9d
SHA1 (patch-daemons_common_procfs.c) = cdcbf58cb3278d5bc718fd235aaa76a10e938002
-SHA1 (patch-source_3rdparty_qmon_Makefile) = c2847af5921aceadea4d669cac38b53478aee29c
-SHA1 (patch-source_clients_qmon_Makefile) = 19fb99bbd753c295296ca4bf986634b654d7b9f7
-SHA1 (patch-source_utilbin_Makefile) = 0377bae49e2e53fa0a7ce7486269c130a16a6c3d
+SHA1 (patch-source_3rdparty_sge_depend_def.h) = 92ad1ef5d0cf237fa083a262d38c67828593f679
+SHA1 (patch-source-utilbin_Makefile) = b01de3925fd6795ee9bd0ad1c1bed7dfb2ed4d92
diff -r f33c15a03c7c -r 60ae23a08cf3 parallel/sge/patches/patch-am
--- a/parallel/sge/patches/patch-am Sun Apr 15 03:51:41 2012 +0000
+++ b/parallel/sge/patches/patch-am Sun Apr 15 04:07:21 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.7 2012/03/20 17:07:43 asau Exp $
+$NetBSD: patch-am,v 1.8 2012/04/15 04:07:21 markd Exp $
Pkgsrc stuff
GridEngine dev mailing list patch for "nbsd-1" issue
@@ -95,12 +95,11 @@
if ( $JNI == 1 ) then
if ( "${JAVA_HOME}/${JAVA_INCL}" != /usr/include ) then
-@@ -2326,7 +2335,7 @@ if ( "$BUILDMAN" == 1 ) then
- setenv PATH ${PATH}:${GROFFPATH}
- endif
+@@ -2797,6 +2806,7 @@ if ( "$QMON" == 1 ) then
+ else
+ set FT_INC = ""
+ endif
++ set FT_INC = "-I${LOCALBASE}/include/freetype2"
-- $SOURCE/scripts/mk_ascman $SOURCE $SGE_PRODUCT_MODE $BUILDMAN $BUILDHTMLMAN
-+ $SOURCE/scripts/mk_ascman $SOURCE $SGE_PRODUCT_MODE 0 $BUILDHTMLMAN
+ cd $COMPILE_ARCH
- if ( $status != 0 ) then
- echo not done
diff -r f33c15a03c7c -r 60ae23a08cf3 parallel/sge/patches/patch-source-utilbin_Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/parallel/sge/patches/patch-source-utilbin_Makefile Sun Apr 15 04:07:21 2012 +0000
@@ -0,0 +1,125 @@
+$NetBSD: patch-source-utilbin_Makefile,v 1.1 2012/04/15 04:07:21 markd Exp $
+
+Add LDFLAGS
+replace $(COMMLISTSLIB) with -lcommlists so that pkgsrc wrapper
+doesnt reorder.
+
+--- source/utilbin/Makefile.orig 2009-02-11 09:27:33.000000000 +0000
++++ source/utilbin/Makefile
+@@ -118,14 +118,14 @@ gethostbyaddr.o: $(UTILBIN_DIR)/gethostb
+
+ #---------------------------------------------------------------------
+ getservbyname: getservbyname.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB)
+- $(CC) $(CFLAGS) -o $@ $(LFLAGS) getservbyname.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(DLLIB) $(LIBS)
++ $(CC) $(CFLAGS) -o $@ $(LFLAGS) getservbyname.o version.o -luti $(WINGRIDLIB) -lcommlists $(DLLIB) $(LIBS)
+
+ getservbyname.o: $(UTILBIN_DIR)/getservbyname.c
+ $(CC) $(CFLAGS) -c $(UTILBIN_DIR)/getservbyname.c
+
+ #---------------------------------------------------------------------
+ filestat: filestat.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB)
+- $(CC) $(CFLAGS) -o $@ $(LFLAGS) filestat.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(LIBS)
++ $(CC) $(CFLAGS) -o $@ $(LFLAGS) filestat.o version.o -luti $(WINGRIDLIB) -lcommlists $(LIBS)
+
+ filestat.o: $(UTILBIN_DIR)/filestat.c
+ $(CC) $(CFLAGS) -c $(UTILBIN_DIR)/filestat.c
+@@ -146,28 +146,28 @@ read_raw.o: $(UTILBIN_DIR)/read_raw.c
+
+ #---------------------------------------------------------------------
+ echo_raw: echo_raw.o version.o $(UTILIB) $(COMMLISTSLIB)
+- $(CC) $(CFLAGS) -o $@ $(LFLAGS) echo_raw.o version.o -luti $(COMMLISTSLIB) $(LIBS)
++ $(CC) $(CFLAGS) -o $@ $(LFLAGS) echo_raw.o version.o -luti -lcommlists $(LIBS)
+
+ echo_raw.o: $(UTILBIN_DIR)/echo_raw.c
+ $(CC) $(CFLAGS) -c $(UTILBIN_DIR)/echo_raw.c
+
+ #---------------------------------------------------------------------
+ checkprog: checkprog.o peopen_standalone.o pids_standalone.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB)
+- $(CC) $(CFLAGS) -o $@ $(LFLAGS) checkprog.o peopen_standalone.o pids_standalone.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(LIBS) $(DLLIB)
++ $(CC) $(CFLAGS) -o $@ $(LFLAGS) checkprog.o peopen_standalone.o pids_standalone.o version.o -luti $(WINGRIDLIB) -lcommlists $(LIBS) $(DLLIB)
+
+ checkprog.o: $(UTILBIN_DIR)/checkprog.c
+ $(CC) $(CFLAGS) -c $(UTILBIN_DIR)/checkprog.c
+
+ #---------------------------------------------------------------------
+ checkuser: checkuser.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB)
+- $(CC) $(CFLAGS) -o $@ $(LFLAGS) checkuser.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(LIBS)
++ $(CC) $(CFLAGS) -o $@ $(LFLAGS) checkuser.o version.o -luti $(WINGRIDLIB) -lcommlists $(LIBS)
+
+ checkuser.o: $(UTILBIN_DIR)/checkuser.c
+ $(CC) $(CFLAGS) -c $(UTILBIN_DIR)/checkuser.c
+
+ #---------------------------------------------------------------------
+ adminrun: adminrun.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB)
+- $(CC) -o $@ $(LFLAGS) adminrun.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(LIBS)
++ $(CC) -o $@ $(LFLAGS) adminrun.o version.o -luti $(WINGRIDLIB) -lcommlists $(LIBS)
+
+ adminrun.o: $(UTILBIN_DIR)/adminrun.c
+ $(CC) $(CFLAGS) -c $(UTILBIN_DIR)/adminrun.c
+@@ -188,7 +188,7 @@ signals.o: $(UTILBIN_DIR)/signals.c
+
+ #---------------------------------------------------------------------
+ loadcheck: loadcheck.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB) $(SGEOBJLIB) $(SGEOBJDLIB) $(CULLLIB)
+- $(CC) -o $@ $(LFLAGS) loadcheck.o version.o -lsgeobj -lsgeobjd -lcull -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(LOADAVGLIBS) $(LIBS)
++ $(CC) -o $@ $(LFLAGS) loadcheck.o version.o -lsgeobj -lsgeobjd -lcull -luti $(WINGRIDLIB) -lcommlists $(LOADAVGLIBS) $(LIBS)
+
+ loadcheck.o: $(UTILBIN_DIR)/loadcheck.c
+ $(CC) $(CFLAGS) -c $(UTILBIN_DIR)/loadcheck.c
+@@ -203,26 +203,26 @@ loadcheck.obj: $(UTILBIN_DIR)/loadcheck.
+
+ #---------------------------------------------------------------------
+ languagetest: languagetest.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB)
+- $(CC) -o $@ $(LFLAGS) languagetest.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(LIBS)
++ $(CC) -o $@ $(LFLAGS) languagetest.o version.o -luti $(WINGRIDLIB) -lcommlists $(LIBS)
+
+ languagetest.o: $(UTILBIN_DIR)/languagetest.c
+ $(CC) $(CFLAGS) $(GCC_NODUPLWARN) -c $(UTILBIN_DIR)/languagetest.c
+ #---------------------------------------------------------------------
+ infotext: infotext.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB)
+- $(CC) -o $@ $(LFLAGS) infotext.o version.o -luti $(WINGRIDLIB) $(COMMLISTSLIB) $(LIBS)
++ $(CC) -o $@ $(LFLAGS) infotext.o version.o -luti $(WINGRIDLIB) -lcommlists $(LIBS)
+
+ infotext.o: $(UTILBIN_DIR)/infotext.c
+ $(CC) $(CFLAGS) $(GCC_NODUPLWARN) -c $(UTILBIN_DIR)/infotext.c
+
+ #---------------------------------------------------------------------
+ fstype: fstype.o version.o $(WINGRIDLIB_DEP) $(COMMLISTSLIB) $(UTILIB)
+- $(CC) -o $@ $(LFLAGS) fstype.o version.o $(WINGRIDLIB) $(FSTYPELIBS) -luti $(COMMLISTSLIB) $(LIBS)
++ $(CC) -o $@ $(LFLAGS) fstype.o version.o $(WINGRIDLIB) $(FSTYPELIBS) -luti -lcommlists $(LIBS)
+
+ fstype.o: $(UTILBIN_DIR)/fstype.c
+ $(CC) $(CFLAGS) $(MEMCFLAG) $(GCC_NODUPLWARN) -c $(UTILBIN_DIR)/fstype.c
+ #---------------------------------------------------------------------
+ spooldefaults: spooldefaults.o version.o sge_mt_init.o $(SPOOLING_DEPS) $(SPOOLCLIB) $(SPOOLLIB) $(SCHEDLIB) $(EVCLIB) $(GDILIB) $(SGEOBJLIB) $(SGEOBJDLIB) $(COMMLIB) $(COMMLISTSLIB) $(CULLLIB)
$(WINGRIDLIB_DEP) $(UTILIB)
+- $(CC) -o $@ $(LFLAGS) spooldefaults.o version.o sge_mt_init.o -lspoolc $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti
$(WINGRIDLIB) $(DLLIB) $(SLIBS) $(LIBS)
++ $(CC) -o $@ $(LFLAGS) spooldefaults.o version.o sge_mt_init.o $(LDFLAGS) -lspoolc $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists
-luti $(WINGRIDLIB) $(DLLIB) $(SLIBS) $(LIBS)
+
+ spooldefaults.o: $(UTILBIN_DIR)/spooldefaults.c
+ $(CC) $(CFLAGS) -c $(UTILBIN_DIR)/spooldefaults.c
+@@ -236,7 +236,7 @@ spoolinit.o: $(UTILBIN_DIR)/spoolinit.c
+
+ #---------------------------------------------------------------------
+ testsuidroot: testsuidroot.o version.o $(WINGRIDLIB_DEP) $(UTILIB) $(COMMLISTSLIB)
+- $(CC) -o $@ $(LFLAGS) testsuidroot.o version.o -luti $(COMMLISTSLIB) $(WINGRIDLIB) $(LIBS)
++ $(CC) -o $@ $(LFLAGS) testsuidroot.o version.o -luti -lcommlists $(WINGRIDLIB) $(LIBS)
+
+ testsuidroot.o: $(UTILBIN_DIR)/testsuidroot.c
+ $(CC) $(CFLAGS) -c $(UTILBIN_DIR)/testsuidroot.c
+@@ -257,7 +257,7 @@ tst_pthread_signals.o: $(UTILBIN_DIR)/ts
+
+ #---------------------------------------------------------------------
+ spooledit: spooledit.o sge_mt_init.o $(SPOOLING_DEPS) $(SPOOLLIB) $(SCHEDLIB) $(EVCLIB) $(GDILIB) $(SGEOBJLIB) $(SGEOBJDLIB) $(COMMLIB) $(COMMLISTSLIB) $(CULLLIB) $(WINGRIDLIB_DEP) $(UTILIB)
+- $(CC) -o $@ $(LFLAGS) spooledit.o version.o sge_mt_init.o -lspoolb $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists -luti
$(WINGRIDLIB) -ldb$(BDB_LIB_SUFFIX) $(DLLIB) $(SLIBS) $(LIBS)
++ $(CC) -o $@ $(LFLAGS) spooledit.o version.o sge_mt_init.o $(LDFLAGS) -lspoolb $(SPOOLING_LIBS) -lsched -levc -lgdi -lsgeobj -lsgeobjd $(SECLIB) $(KRBLIB) -lcull -lcomm -lcommlists
-luti $(WINGRIDLIB) -ldb$(BDB_LIB_SUFFIX) $(DLLIB) $(SLIBS) $(LIBS)
+
+ spooledit.o: $(UTILBIN_DIR)/spooledit.c
+ $(CC) $(CFLAGS) -c $(UTILBIN_DIR)/spooledit.c
Home |
Main Index |
Thread Index |
Old Index