From: František Dvořák Date: Mon, 9 Jul 2012 15:54:53 +0000 (+0000) Subject: Debian package builds in vanilla chroot environment: X-Git-Tag: gridsite-core_R_1_7_22~30 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=14e5b42ee786c3f71f3725af894cc41de0c0f4da;p=jra1mw.git Debian package builds in vanilla chroot environment: - create pkg-config file for gss (depends on used GSSAPI provider) - spread proper CFLAGS needed for gss (to find gssapi.h) using pkg-config - missing build dependencies - missing dependency for libglite-lbjp-common-gsoap-plugin-dev (lb.ws-test build) --- diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile index bdde5c4..3e74d2e 100644 --- a/org.glite.lb.client/Makefile +++ b/org.glite.lb.client/Makefile @@ -111,13 +111,16 @@ COMMON_LIB_THR:=-lglite_lb_common_${thrflavour} COMMON_LIB:=-lglite_lb_common TRIO_LIB:=-lglite_lbu_trio +GLITE_LBJP_COMMON_GSS_CFLAGS?=`PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:${PREFIX}${prefix}/${libdir}/pkgconfig pkg-config glite-security-gss --cflags` + CFLAGS:=${DEBUG} \ -I. \ -I${top_srcdir}/src -I${top_srcdir}/interface \ -I${stagedir}${prefix}/include \ ${COVERAGE_FLAGS} \ -DBUILDING_LB_CLIENT \ - -D_GNU_SOURCE ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} ${CFLAGS} + -D_GNU_SOURCE ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} \ + ${GLITE_LBJP_COMMON_GSS_CFLAGS} ${CFLAGS} CXXFLAGS:=${CFLAGS} diff --git a/org.glite.lb.common/Makefile b/org.glite.lb.common/Makefile index 9eb2534..806913f 100644 --- a/org.glite.lb.common/Makefile +++ b/org.glite.lb.common/Makefile @@ -65,6 +65,7 @@ EXPAT_CFLAGS?=-I${expat_prefix}/include EXPAT_LIBS?=${expatlib} -lexpat CLASSADS_CFLAGS?=-I${classads_prefix}/include -I${classads_prefix}/include/classad CLASSADS_LIBS?=${classadslib} -lclassad +GLITE_LBJP_COMMON_GSS_CFLAGS?=`PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:${PREFIX}${prefix}/${libdir}/pkgconfig pkg-config glite-security-gss --cflags` CFLAGS:=${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface \ -I. \ @@ -75,7 +76,7 @@ CFLAGS:=${DEBUG} -I${top_srcdir}/src -I${top_srcdir}/interface \ ${COVERAGE_FLAGS} \ -D_GNU_SOURCE \ -DDATAGRID_EXTENSION ${LB_STANDALONE_FLAGS} \ - -DBUILDING_LB_COMMON ${CFLAGS} + -DBUILDING_LB_COMMON ${GLITE_LBJP_COMMON_GSS_CFLAGS} ${CFLAGS} LDFLAGS:=${LDFLAGS} -L${stagedir}${prefix}/${libdir} \ ${COVERAGE_FLAGS} diff --git a/org.glite.lb.doc/project/debian.control b/org.glite.lb.doc/project/debian.control index 37b2b8e..c17d238 100644 --- a/org.glite.lb.doc/project/debian.control +++ b/org.glite.lb.doc/project/debian.control @@ -2,7 +2,7 @@ Source: glite-lb-doc Priority: extra Maintainer: @MAINTAINER@ Uploaders: @UPLOADERS@ -Build-Depends: debhelper (>= 7.0.50~), texlive-latex-extra +Build-Depends: debhelper (>= 7.0.50~), texlive-latex-extra, texlive-latex-recommended, texlive-fonts-recommended, glite-lb-types Standards-Version: 3.9.1 Section: doc Homepage: @URL@ diff --git a/org.glite.lb.harvester/Makefile b/org.glite.lb.harvester/Makefile index 5503339..46eee6b 100644 --- a/org.glite.lb.harvester/Makefile +++ b/org.glite.lb.harvester/Makefile @@ -26,7 +26,8 @@ SOURCES=\ Makefile SOURCES_EXEC=config/startup examples/*.sh -CPPFLAGS:=-I${stagedir}${prefix}/include -D_GNU_SOURCE -D_REENTRANT ${CPPFLAGS} +GLITE_LBJP_COMMON_GSS_CFLAGS?=`PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:${PREFIX}${prefix}/${libdir}/pkgconfig pkg-config glite-security-gss --cflags` +CPPFLAGS:=-I${stagedir}${prefix}/include -D_GNU_SOURCE -D_REENTRANT ${GLITE_LBJP_COMMON_GSS_CFLAGS} ${CPPFLAGS} CFLAGS:=-W -Wall -g -O2 ${CFLAGS} LDFLAGS:=${LDFLAGS} ifeq (${thrflavour},) diff --git a/org.glite.lb.logger-msg/Makefile b/org.glite.lb.logger-msg/Makefile index d1dbde9..d3f5c71 100644 --- a/org.glite.lb.logger-msg/Makefile +++ b/org.glite.lb.logger-msg/Makefile @@ -39,13 +39,16 @@ ACTIVEMQ_LIBS?=-L${activemq_prefix}/${libdir} -lactivemq-cpp CPPUNIT_LIBS?=-L${cppunit_prefix}/${libdir} -lcppunit CPPUNIT_CFLAGS?=-I${cppunit_prefix}/include +GLITE_LBJP_COMMON_GSS_CFLAGS?=`PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:${PREFIX}${prefix}/${libdir}/pkgconfig pkg-config glite-security-gss --cflags` + DEBUG:=-g -O0 -CFLAGS:=${CFLAGS} ${DEBUG} \ +CFLAGS:=${DEBUG} \ -I${stagedir}${prefix}/include -I${top_srcdir}/src \ ${ACTIVEMQ_CFLAGS} \ -D_GNU_SOURCE \ ${COVERAGE_FLAGS} \ - ${VERSION} ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} + ${VERSION} ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} \ + ${GLITE_LBJP_COMMON_GSS_CFLAGS} ${CFLAGS} LDFLAGS:=${LDFLAGS} -L${stagedir}${prefix}/${libdir} \ ${COVERAGE_FLAGS} diff --git a/org.glite.lb.logger/Makefile b/org.glite.lb.logger/Makefile index 7f0ff31..669a05f 100644 --- a/org.glite.lb.logger/Makefile +++ b/org.glite.lb.logger/Makefile @@ -61,12 +61,15 @@ default_thrflavour=_${thrflavour} default_nothrflavour=_${nothrflavour} endif +GLITE_LBJP_COMMON_GSS_CFLAGS?=`PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:${PREFIX}${prefix}/${libdir}/pkgconfig pkg-config glite-security-gss --cflags` + DEBUG:=-g -O0 -CFLAGS:=${CFLAGS} ${DEBUG} \ +CFLAGS:=${DEBUG} \ -I${stagedir}${prefix}/include -I${top_srcdir}/src -I${top_srcdir}/interface \ -D_GNU_SOURCE \ ${COVERAGE_FLAGS} \ - ${VERSION} ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} + ${VERSION} ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} \ + ${GLITE_LBJP_COMMON_GSS_CFLAGS} ${CFLAGS} LDFLAGS:=${LDFLAGS} -L${stagedir}${prefix}/${libdir} \ ${COVERAGE_FLAGS} diff --git a/org.glite.lb.logger/project/debian.control b/org.glite.lb.logger/project/debian.control index b57b1db..ffb575d 100644 --- a/org.glite.lb.logger/project/debian.control +++ b/org.glite.lb.logger/project/debian.control @@ -2,7 +2,7 @@ Source: glite-lb-logger Priority: extra Maintainer: @MAINTAINER@ Uploaders: @UPLOADERS@ -Build-Depends: debhelper (>= 7.0.50~), chrpath, libcppunit-dev, libglite-jobid-api-c-dev, libglite-lbjp-common-gss-dev, libglite-lbjp-common-log-dev, libglite-lbjp-common-trio-dev, libtool, pkg-config +Build-Depends: debhelper (>= 7.0.50~), chrpath, libcppunit-dev, libglite-lb-common-dev, libglite-jobid-api-c-dev, libglite-lbjp-common-gss-dev, libglite-lbjp-common-log-dev, libglite-lbjp-common-trio-dev, libtool, pkg-config Standards-Version: 3.9.1 Section: misc Homepage: @URL@ diff --git a/org.glite.lb.server/Makefile b/org.glite.lb.server/Makefile index f76baee..4b28982 100644 --- a/org.glite.lb.server/Makefile +++ b/org.glite.lb.server/Makefile @@ -122,6 +122,8 @@ CPPUNIT_CFLAGS?=-I${cppunit_prefix}/include VOMS_CFLAGS?=-I${voms_prefix}/include -I${voms_prefix}/include/glite/security VOMS_LIBS?=-L${voms_prefix}/${libdir} -lvomsapi${vomsflavour} +GLITE_LBJP_COMMON_CFLAGS?=`PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:${PREFIX}${prefix}/${libdir}/pkgconfig pkg-config glite-security-gss glite-security-gsoap-plugin --cflags` + ifeq ($(gssapi_provider), kerberos) GSSAPI_GSI_CFLAGS=${KERBEROS_GSSAPI_GSI_CFLAGS} VOMS_LIBS= @@ -130,7 +132,7 @@ else GSSAPI_GSI_CFLAGS=${GLOBUS_GSSAPI_GSI_CFLAGS} endif -CFLAGS:= ${CFLAGS} \ +CFLAGS:= \ ${GSSAPI_GSI_CFLAGS} \ ${WS_CFLAGS} ${DEBUG} \ -DVERSION=\"${version}\" \ @@ -143,7 +145,8 @@ CFLAGS:= ${CFLAGS} \ ${VOMS_CFLAGS} \ ${COVERAGE_FLAGS} \ $(GRIDSITE_CFLAGS) ${LCAS_CFLAGS} ${GSOAP_CFLAGS} \ - -D_GNU_SOURCE ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} -DLB_EVENTS_BLOB + -D_GNU_SOURCE ${LB_STANDALONE_FLAGS} ${LB_PERF_FLAGS} -DLB_EVENTS_BLOB \ + ${GLITE_LBJP_COMMON_CFLAGS} ${CFLAGS} CXXFLAGS:=${CFLAGS} diff --git a/org.glite.lb.state-machine/Makefile b/org.glite.lb.state-machine/Makefile index 5b1068e..a6606b6 100644 --- a/org.glite.lb.state-machine/Makefile +++ b/org.glite.lb.state-machine/Makefile @@ -38,6 +38,7 @@ CLASSADS_CFLAGS?=-I${classads_prefix}/include -I${classads_prefix}/include/class CLASSADS_LIBS?=${classadslib} -lclassad EXPAT_CFLAGS?= EXPAT_LIBS?=${expatlib} -lexpat +GLITE_LBJP_COMMON_GSS_CFLAGS?=`PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:${PREFIX}${prefix}/${libdir}/pkgconfig pkg-config glite-security-gss --cflags` DEBUG:=-g -O0 -Wall @@ -45,7 +46,7 @@ CFLAGS:= \ ${DEBUG} \ ${CLASSADS_CFLAGS} \ -I${stagedir}${prefix}/include -I${top_srcdir}/src -I. \ - -I${top_srcdir}/interface ${CFLAGS} + -I${top_srcdir}/interface ${GLITE_LBJP_COMMON_GSS_CFLAGS} ${CFLAGS} COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} diff --git a/org.glite.lb.utils/Makefile b/org.glite.lb.utils/Makefile index c953bbc..6299896 100644 --- a/org.glite.lb.utils/Makefile +++ b/org.glite.lb.utils/Makefile @@ -40,8 +40,9 @@ endif EXPAT_CFLAGS?=-I${expat_prefix}/include EXPAT_LIB?=${expatlib} -lexpat GSOAP_CFLAGS?=-I${gsoap_prefix}/include -I${gsoap_prefix}/ +GLITE_LBJP_COMMON_GSS_CFLAGS?=`PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:${PREFIX}${prefix}/${libdir}/pkgconfig pkg-config glite-security-gss --cflags` -CFLAGS:= ${CFLAGS} \ +CFLAGS:= \ ${WS_CFLAGS} ${DEBUG} \ -DVERSION=\"${version}\" \ -I${stagedir}${prefix}/include -I${top_srcdir}/src -I. \ @@ -49,7 +50,8 @@ CFLAGS:= ${CFLAGS} \ ${EXPAT_CFLAGS} \ ${GSOAP_CFLAGS} \ ${COVERAGE_FLAGS} \ - -D_GNU_SOURCE + -D_GNU_SOURCE ${GLITE_LBJP_COMMON_GSS_CFLAGS} ${CFLAGS} + LDFLAGS:=${LDFLAGS} -L${stagedir}${prefix}/${libdir} COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} @@ -127,6 +129,7 @@ install: clean: rm -rfv ${ALLUTILS} ${MAN_GZ} ${MAN8_GZ} *.lo *.o .libs/ + rm -rvf dist ${package}-*.tar.gz distclean: rm -rvf Makefile.inc *.spec debian/ diff --git a/org.glite.lb.utils/project/debian.control b/org.glite.lb.utils/project/debian.control index 9c6b622..ea32ae2 100644 --- a/org.glite.lb.utils/project/debian.control +++ b/org.glite.lb.utils/project/debian.control @@ -2,7 +2,7 @@ Source: glite-lb-utils Priority: extra Maintainer: @MAINTAINER@ Uploaders: @UPLOADERS@ -Build-Depends: debhelper (>= 7.0.50~), chrpath, glite-lb-types, libcppunit-dev, libglite-jobid-api-c-dev, libglite-lb-client-dev, libglite-lb-state-machine-dev, libglite-lbjp-common-jp-interface-dev, libglite-lbjp-common-maildir-dev, libglite-lbjp-common-trio-dev, pkg-config +Build-Depends: debhelper (>= 7.0.50~), chrpath, glite-lb-types, libcppunit-dev, libglite-jobid-api-c-dev, libglite-lb-client-dev, libglite-lb-state-machine-dev, libglite-lbjp-common-jp-interface-dev, libglite-lbjp-common-maildir-dev, libglite-lbjp-common-trio-dev, libtool, pkg-config Standards-Version: 3.9.1 Section: misc Homepage: @URL@ diff --git a/org.glite.lb.ws-test/Makefile b/org.glite.lb.ws-test/Makefile index e291ebe..5c637c6 100644 --- a/org.glite.lb.ws-test/Makefile +++ b/org.glite.lb.ws-test/Makefile @@ -42,12 +42,15 @@ endif VPATH=${top_srcdir}/examples:${top_srcdir}/tests CC=gcc + +GLITE_LBJP_COMMON_CFLAGS?=`PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:${PREFIX}${prefix}/${libdir}/pkgconfig pkg-config glite-security-gsoap-plugin --cflags` + DEBUG:=-g -O0 -Wall CFLAGS:=${CFLAGS} -I${gsoap_prefix}/include -I${gsoap_prefix}/ \ -I${stagedir}${prefix}/include -I${top_srcdir}/src -I. \ ${GLOBUS_GSSAPI_GSI_CFLAGS} \ ${GSOAP_CFLAGS} \ - ${DEBUG} + ${DEBUG} ${GLITE_LBJP_COMMON_CFLAGS} ${CFLAGS} COMPILE:=libtool --mode=compile ${CC} ${CFLAGS} LINK:=libtool --mode=link ${CC} -rpath ${stagedir}${prefix}/${libdir} ${LDFLAGS} diff --git a/org.glite.lbjp-common.gsoap-plugin/Makefile b/org.glite.lbjp-common.gsoap-plugin/Makefile index 92806f8..dd97f74 100644 --- a/org.glite.lbjp-common.gsoap-plugin/Makefile +++ b/org.glite.lbjp-common.gsoap-plugin/Makefile @@ -18,7 +18,7 @@ CC=gcc SOURCES=\ examples/*.c examples/*.S \ interface/*.h interface/*.h.in \ - project/.post* project/gsoap-plugin*.in project/libtoolhack/gcc \ + project/.post* project/gsoap-plugin*.pc.in project/libtoolhack/gcc \ src/*.c \ test/*.cpp \ LICENSE Makefile @@ -101,13 +101,15 @@ GSOAP_CFLAGS_lang:=${GSOAPXX_CFLAGS} GSOAP_LIBS_lang:=${GSOAPXX_LIBS} endif +GLITE_LBJP_COMMON_GSS_CFLAGS?=`PKG_CONFIG_PATH=$$PKG_CONFIG_PATH:${PREFIX}${prefix}/${libdir}/pkgconfig pkg-config glite-security-gss --cflags` CFLAGS:= ${DEBUG} \ -DVERSION=\"${version}\" \ -DWITH_NONAMESPACES \ -I. -I${top_srcdir2}/interface \ -I${stagedir}${prefix}/include \ - ${COVERAGE_FLAGS} -D_GNU_SOURCE -DDATAGRID_EXTENSION ${CFLAGS} + ${COVERAGE_FLAGS} -D_GNU_SOURCE -DDATAGRID_EXTENSION \ + ${GLITE_LBJP_COMMON_GSS_CFLAGS} ${CFLAGS} LDFLAGS:=${LDFLAGS} ${COVERAGE_FLAGS} @@ -382,7 +384,7 @@ distclean: ${COMPILE} ${GSOAP_DEFAULT_CFLAGS} -o $@ -c $< %.pc: %.pc.in - sed -e "s/@VERSION@/${version}/" -e "s/@LIBDIR@/${libdir}/" -e "s/@LIB_SUFFIX@/${dotless_ver}/" $< > $@; \ + sed -e "s,@PREFIX@,${PREFIX}${prefix}," -e "s/@VERSION@/${version}/" -e "s/@LIBDIR@/${libdir}/" -e "s/@LIB_SUFFIX@/${dotless_ver}/" $< > $@ test_gsplugin_cxx.o: %.o: %.cpp stdsoap2.h ${COMPILEXX} ${GSOAPXX_DEFAULT_CFLAGS} -c ${GLOBUS_INC} $< diff --git a/org.glite.lbjp-common.gsoap-plugin/project/debian.control b/org.glite.lbjp-common.gsoap-plugin/project/debian.control index 03395c8..b5c1992 100644 --- a/org.glite.lbjp-common.gsoap-plugin/project/debian.control +++ b/org.glite.lbjp-common.gsoap-plugin/project/debian.control @@ -26,7 +26,7 @@ Package: libglite-lbjp-common-gsoap-plugin-dev Section: libdevel Architecture: any Provides: glite-lbjp-common-gsoap-plugin, glite-security-gsoap-plugin -Depends: libglite-lbjp-common-gsoap-plugin (= ${binary:Version}), ${misc:Depends} +Depends: libglite-lbjp-common-gsoap-plugin (= ${binary:Version}), libglite-lbjp-common-gss-dev, ${misc:Depends} Description: Development files for gLite gsoap-plugin This package contains development libraries and header files for gLite gsoap-plugin. diff --git a/org.glite.lbjp-common.gsoap-plugin/project/gsoap-plugin++.pc.in b/org.glite.lbjp-common.gsoap-plugin/project/gsoap-plugin++.pc.in index 3abce84..7303f01 100644 --- a/org.glite.lbjp-common.gsoap-plugin/project/gsoap-plugin++.pc.in +++ b/org.glite.lbjp-common.gsoap-plugin/project/gsoap-plugin++.pc.in @@ -1,4 +1,4 @@ -prefix=/usr +prefix=@PREFIX@ exec_prefix=${prefix} libdir=/usr/@LIBDIR@ includedir=${prefix}/include @@ -6,6 +6,6 @@ includedir=${prefix}/include Name: gLite security gSoap plugin Description: Plugin for gSoap to use glite-security-gss as the communication layer Version: @VERSION@ -Requires: gsoap++ +Requires: gsoap++ glite-security-gss Libs: -L${libdir} -lglite_security_gsoap_plugin_@LIB_SUFFIX@_cxx -lglite_security_gss Cflags: -I${includedir} diff --git a/org.glite.lbjp-common.gsoap-plugin/project/gsoap-plugin.pc.in b/org.glite.lbjp-common.gsoap-plugin/project/gsoap-plugin.pc.in index fd8dac5..64bdf26 100644 --- a/org.glite.lbjp-common.gsoap-plugin/project/gsoap-plugin.pc.in +++ b/org.glite.lbjp-common.gsoap-plugin/project/gsoap-plugin.pc.in @@ -1,4 +1,4 @@ -prefix=/usr +prefix=@PREFIX@ exec_prefix=${prefix} libdir=/usr/@LIBDIR@ includedir=${prefix}/include @@ -6,6 +6,6 @@ includedir=${prefix}/include Name: gLite security gSoap plugin Description: Plugin for gSoap to use glite-security-gss as the communication layer Version: @VERSION@ -Requires: gsoap +Requires: gsoap glite-security-gss Libs: -L${libdir} -lglite_security_gsoap_plugin_@LIB_SUFFIX@_c -lglite_security_gss Cflags: -I${includedir} diff --git a/org.glite.lbjp-common.gss/Makefile b/org.glite.lbjp-common.gss/Makefile index 387ea9e..109923c 100644 --- a/org.glite.lbjp-common.gss/Makefile +++ b/org.glite.lbjp-common.gss/Makefile @@ -36,12 +36,12 @@ offset=6 version_info:=-version-info ${shell \ perl -e '$$,=":"; @F=split "\\.","${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' } -VPATH=${top_srcdir}/src:${top_srcdir}/test:${top_srcdir}/examples +VPATH=${top_srcdir}/src:${top_srcdir}/test:${top_srcdir}/examples:${top_srcdir}/project SOURCES=\ examples/*.c examples/*.h \ interface/*.h \ - project/.post* \ + project/.post* project/*.pc.in \ project/doc/*.cls project/doc/*.pdf project/doc/*.tex project/doc/Makefile \ src/*.c \ test/*.cpp \ @@ -99,11 +99,13 @@ GSSAPI_THR_LIBS=${GLOBUS_COMMON_LIBS} ${KERBEROS_GSSAPI_LIBS} -lssl GSSAPI_THR_INC=${GLOBUS_COMMON_CFLAGS} ${KERBEROS_GSSAPI_CFLAGS} -DNO_GLOBUS_GSSAPI GSSAPI_NOTHR_LIBS=${GLOBUS_NOTHR_LIBS} ${KERBEROS_GSSAPI_LIBS} -lssl GSSAPI_NOTHR_INC=${GLOBUS_NOTHR_INC} ${KERBEROS_GSSAPI_CFLAGS} -DNO_GLOBUS_GSSAPI +GSSAPI_PROVIDER_PKG= else GSSAPI_THR_LIBS=${GLOBUS_GSSAPI_GSI_LIBS} GSSAPI_THR_INC=${GLOBUS_GSSAPI_GSI_CFLAGS} GSSAPI_NOTHR_LIBS=${GLOBUS_NOTHR_LIBS} ${GLOBUS_GSSAPI_NOTHR_LIBS} GSSAPI_NOTHR_INC=${GLOBUS_NOTHR_INC} +GSSAPI_PROVIDER_PKG=globus-gssapi-gsi endif LIBCARES_CFLAGS?=-I${cares_prefix}/include @@ -133,6 +135,7 @@ lib_LIBRARIES=${GSS_NOTHRSTATICLIB} ${GSS_THRSTATICLIB} default_gss=${GSS_NOTHRLTLIB} endif +PKG_CONFIG_FILES=gss.pc ifeq ($(thrflavour),) ${GSS_STATICLIB}: ${GSS_THROBJS} @@ -158,7 +161,7 @@ ${GSS_THRLTLIB}: ${GSS_THROBJS} endif -all compile: $(lib_LTLIBRARIES) ${lib_LIBRARIES} examples +all compile: $(lib_LTLIBRARIES) ${lib_LIBRARIES} examples ${PKG_CONFIG_FILES} check: compile check.gss @@ -188,7 +191,7 @@ stage: $(MAKE) install PREFIX=${stagedir} DOSTAGE=yes install: - -mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir} + -mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}/pkgconfig -mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version} -mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/glite/security ${INSTALL} -m 755 ${lib_LTLIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir} @@ -197,9 +200,10 @@ install: if [ x${DOSTAGE} = xyes ]; then \ install -m 644 ${lib_LIBRARIES} ${DESTDIR}${PREFIX}${prefix}/${libdir}; \ fi + ${INSTALL} -m 644 gss.pc ${DESTDIR}${PREFIX}${prefix}/${libdir}/pkgconfig/glite-security-gss.pc clean: - rm -rf *.o *.lo *.a *.la .libs test_gss gss_server gss_client + rm -rf *.o *.lo *.a *.la .libs test_gss gss_server gss_client *.pc rm -rvf dist ${package}-*.tar.gz distclean: @@ -211,6 +215,9 @@ distclean: %.thr.o: %.c ${COMPILE} -D_REENTRANT -DGLITE_LBU_THREADED ${GSSAPI_THR_INC} ${LIBCARES_CFLAGS} -o $@ -c $< +%.pc: %.pc.in + sed -e "s,@PREFIX@,${PREFIX}${prefix}," -e "s/@VERSION@/${version}/" -e "s/@LIBDIR@/${libdir}/" -e "s/@GSSAPI_PROVIDER@/${GSSAPI_PROVIDER_PKG}/" $< > $@ + test_gss.o: %.o: %.cpp ${CXX} -c ${CFLAGS} ${GLOBUS_GSSAPI_GSI_CFLAGS} ${CPPUNIT_CFLAGS} -Wno-error $< diff --git a/org.glite.lbjp-common.gss/project/debian.libglite-lbjp-common-gss-dev.install b/org.glite.lbjp-common.gss/project/debian.libglite-lbjp-common-gss-dev.install index 6cb0e0b..07e8c8a 100644 --- a/org.glite.lbjp-common.gss/project/debian.libglite-lbjp-common-gss-dev.install +++ b/org.glite.lbjp-common.gss/project/debian.libglite-lbjp-common-gss-dev.install @@ -1,2 +1,3 @@ usr/include/glite/security/*.h usr/lib/lib*.so +usr/lib/pkgconfig/*.pc diff --git a/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec b/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec index d0fcaba..5193895 100644 --- a/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec +++ b/org.glite.lbjp-common.gss/project/glite-lbjp-common-gss.spec @@ -103,6 +103,7 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/include/glite/security /usr/include/glite/security/glite_gss.h /usr/%{_lib}/libglite_security_gss.so +/usr/%{_lib}/pkgconfig/*.pc %changelog diff --git a/org.glite.lbjp-common.gss/project/gss.pc.in b/org.glite.lbjp-common.gss/project/gss.pc.in new file mode 100644 index 0000000..274af39 --- /dev/null +++ b/org.glite.lbjp-common.gss/project/gss.pc.in @@ -0,0 +1,11 @@ +prefix=@PREFIX@ +exec_prefix=${prefix} +libdir=/usr/@LIBDIR@ +includedir=${prefix}/include + +Name: gLite security wrapper of Globus GSS/SSL implementation +Description: glite-security-gss wraps GSS functions to a secure network communication library +Version: @VERSION@ +Requires: @GSSAPI_PROVIDER@ +Libs: -L${libdir} -lglite_security_gss +Cflags: -I${includedir}