mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00
Code Issues Releases Activity

Remove unnecessary CPPFLAGS and fix the import paths properly. It seems

Browse Source 
there was an upstream bug introduced in 2.7.11 (via Red Hat), which broke
the default values.  In r295977, we added a hack to override these two
definitions but it was actually incomplete and incorrect, e. g., the import
path for wsdl2h was still not properly set.  Now we fix the root cause of
these longstanding problems correctly.
This commit is contained in:
Jung-uk Kim 2014-01-16 23:35:43 +00:00
parent 780132228a
commit 269c37fc15
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=339999
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devel/gsoap/Makefile
View File

@ -14,8 +14,6 @@ COMMENT= Generator Tools for Coding SOAP/XML Web Services in C and C++
LICENSE= GPLv2
CONFIGURE_ENV= LEX=flex YACC=yacc
CPPFLAGS+= -DWSDL_TYPEMAP_FILE=\\\"${DATADIR}/WS/typemap.dat\\\" \
-DSOAPCPP2_IMPORT_PATH=\\\"${DATADIR}/import\\\"
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
USES= pathfix
@ -40,7 +38,10 @@ CONFIGURE_ARGS= --disable-ssl
.endif
post-patch:
${REINPLACE_CMD} -e 's| sys/timeb.h | |' ${WRKSRC}/${CONFIGURE_SCRIPT}
${REINPLACE_CMD} -e 's| sys/timeb.h | |' \
-e 's|-DSOAPCPP_IMPORT_PATH=|-DSOAPCPP2_IMPORT_PATH=|' \
-e 's|-DWSDL_IMPORT_PATH=|-DWSDL2H_IMPORT_PATH=|' \
${WRKSRC}/${CONFIGURE_SCRIPT}
post-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gsoap

11
devel/gsoap/files/patch-gsoap__wsdl__Makefile.in Normal file
View File

@ -0,0 +1,11 @@
--- gsoap/wsdl/Makefile.in 2013-12-18 14:58:38.000000000 -0500
+++ gsoap/wsdl/Makefile.in 2014-01-16 14:35:52.000000000 -0500
@@ -204,7 +204,7 @@
BUILT_SOURCES = $(SOAP_CPP_SRC)
wsdl2h_CFLAGS = $(C_DEBUG_FLAGS) $(WSDL2H_EXTRA_FLAGS)
wsdl2h_CXXFLAGS = $(C_DEBUG_FLAGS) $(WSDL2H_EXTRA_FLAGS)
-wsdl2h_CPPFLAGS = $(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) -D$(platform)
+wsdl2h_CPPFLAGS = $(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) $(WSDL2H_IMPORTPATH) -D$(platform)
wsdl2h_SOURCES = wsdl2h.cpp wsdl.cpp schema.cpp types.cpp service.cpp soap.cpp mime.cpp wsp.cpp $(SOAP_CPP_SRC)
wsdl2h_LDADD = $(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS)
CLEANFILES = *~ *C.cpp *H.h *Stub.h *.nsmap