Added patch to use globus compilation flags also in the RPMS

diff --git a/org.gridsite.core/build.xml b/org.gridsite.core/build.xml
index a14ff13..0d98576 100644 (file)
--- a/org.gridsite.core/build.xml
+++ b/org.gridsite.core/build.xml
@@ -20,6 +20,9 @@
 
        Revision history:
        $Log$
+       Revision 1.10  2004/12/17 09:11:43  dimeglio
+       Added local tag targets (because of special naming rules here)
+       
        Revision 1.9  2004/12/17 09:02:49  dimeglio
        Removed redefinition of global.prefix
        
@@ -160,7 +163,7 @@
     </target>
 
        <target name="dist" depends="stage">
-               <make target="rpm" dir="${module.src.dir}" failonerror="${failonerror}"/>
+               <make target="rpm" dir="${module.src.dir}" failonerror="${failonerror}" args="${build.make.arguments}"/>
                <exec dir="${module.dir}/RPMTMP/BUILDROOT/usr" executable="tar">
                        <arg line="-czf ${module.dir}/gridsite-${module.version}_bin.tar.gz ." />
                </exec>

diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile
index 89acbee..4606f26 100644 (file)
--- a/org.gridsite.core/src/Makefile
+++ b/org.gridsite.core/src/Makefile
@@ -309,6 +309,8 @@ rpm: dist gridsite.spec
              $(MYRPMDIR)/SRPMS $(MYRPMDIR)/RPMS/i386 $(MYRPMDIR)/BUILDROOT
        cp -f ../gridsite-$(PATCH_VERSION).src.tar.gz $(MYRPMDIR)/SOURCES
        cp -f gridsite.spec $(MYRPMDIR)/SPECS
+       export OPENSSL_FLAGS=$(OPENSSL_FLAGS) ; export OPENSSL_LIBS=$(OPENSSL_LIBS) ; export FLAVOR_EXT=$(FLAVOR_EXT) ; \
+       export GSOAPDIR=$(GSOAPDIR) ; \
        export MYPREFIX=/usr ; export MYVERSION=$(PATCH_VERSION) ; \
          $(RPMCMD) --define "_topdir $(MYRPMDIR)" \
                   -ba --buildroot $(MYRPMDIR)/BUILDROOT gridsite.spec

diff --git a/org.gridsite.core/src/gridsite.spec b/org.gridsite.core/src/gridsite.spec
index 7e4a5ef..5bf3b16 100644 (file)
--- a/org.gridsite.core/src/gridsite.spec
+++ b/org.gridsite.core/src/gridsite.spec
@@ -37,11 +37,15 @@ HTTP/HTTPS rather than ssh as its transfer protocol.
 
 %build
 cd src
-make prefix=$RPM_BUILD_ROOT/%(echo ${MYPREFIX:-/usr})
+make prefix=$RPM_BUILD_ROOT/%(echo ${MYPREFIX:-/usr}) \
+GSOAPDIR=$GSOAPDIR OPENSSL_FLAGS=$OPENSSL_FLAGS \
+OPENSSL_LIBS=$OPENSSL_LIBS FLAVOR_EXT=$FLAVOR_EXT
 
 %install
 cd src
-make install prefix=$RPM_BUILD_ROOT/%(echo ${MYPREFIX:-/usr})
+make install prefix=$RPM_BUILD_ROOT/%(echo ${MYPREFIX:-/usr}) \
+GSOAPDIR=$GSOAPDIR OPENSSL_FLAGS=$OPENSSL_FLAGS \
+OPENSSL_LIBS=$OPENSSL_LIBS FLAVOR_EXT=$FLAVOR_EXT
 
 %post
 /sbin/ldconfig