Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv14475
Modified Files:
xerces-c.info xerces-c.patch
Log Message:
latest version to stable
Index: xerces-c.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/xerces-c.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xerces-c.patch 17 Aug 2007 02:11:13 -0000 1.1
+++ xerces-c.patch 14 Aug 2008 01:15:35 -0000 1.2
@@ -1,6 +1,49 @@
-diff -urN xerces-c-src_2_6_0-orig/samples/runConfigure
xerces-c-src_2_6_0/samples/runConfigure
---- xerces-c-src_2_6_0-orig/samples/runConfigure Fri Sep 10 09:52:24 2004
-+++ xerces-c-src_2_6_0/samples/runConfigure Mon Mar 14 09:38:18 2005
+diff -urN xerces-c-src_2_7_0-orig/obj/Makefile.in
xerces-c-src_2_7_0/obj/Makefile.in
+--- xerces-c-src_2_7_0-orig/obj/Makefile.in 2005-09-07 11:56:58.000000000
-0400
++++ xerces-c-src_2_7_0/obj/Makefile.in 2007-12-08 13:26:09.000000000 -0500
+@@ -126,7 +126,7 @@
+ ## DepDOM ##
+ ${FQ_SO_DEPDOM}: $(DEPDOM_OBJECTS)
+ @echo Building ${FQ_SO_DEPDOM}
+- ${MAKE_SHARED} ${LD_SODEPDOM} -o [EMAIL PROTECTED] ${^}
$(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS)
-L${LIB} -l${LINK_LIBNAME}
++ ${MAKE_SHARED} ${LD_SODEPDOM} -o [EMAIL PROTECTED] ${^}
$(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS)
${LIB}/lib${LINK_LIBNAME}${SHLIBSUFFIX}
+ @echo symlink ${FQ_REAL_DEPDOM}.a
+ rm -rf ${FQ_REAL_DEPDOM}.a && ln -s
${XML_LIB_DIR}/${LIBDEPDOM}${SO_TARGET_VERSION}${SHLIBSUFFIX}.a
${FQ_REAL_DEPDOM}.a
+ @echo symlink ${FQ_LINK_DEPDOM}.a
+@@ -151,14 +151,14 @@
+ @echo Building ${FQ_REAL_DEPDOM}
+ ifeq (${PLATFORM},SOLARIS)
+ cp $(DEPDOM_OBJECTS) $(PLATFORM)
+- ${MAKE_SHARED} ${LD_SODEPDOM} -o [EMAIL PROTECTED] ${DEPDOM_OBJS}
$(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS)
-L${LIB} -l${LINK_LIBNAME}
++ ${MAKE_SHARED} ${LD_SODEPDOM} -o [EMAIL PROTECTED] ${DEPDOM_OBJS}
$(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS)
${LIB}/lib${LINK_LIBNAME}${SHLIBSUFFIX}
+ rm ${DEPDOM_OBJS}
+ else
+ ifeq (${PLATFORM},OS390)
+ ${MAKE_SHARED} ${LD_SODEPDOM} -o [EMAIL PROTECTED] ${^}
$(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS)
${LIB}/${LIBNAME}${VER}${OS390SIDEDECK}
+ $(CP) ${LIBDEPDOM}${VER}${OS390SIDEDECK} ${LIB}
+ else
+- ${MAKE_SHARED} ${LD_SODEPDOM} -o [EMAIL PROTECTED] ${^}
$(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS)
-L${LIB} -l${LINK_LIBNAME}
++ ${MAKE_SHARED} ${LD_SODEPDOM} -o [EMAIL PROTECTED] ${^}
$(TEMPLATESOBJS) $(PLATFORM_LIBRARIES) $(DEPDOM_LINK_OPTIONS) $(ALLLIBS)
${LIB}/lib${LINK_LIBNAME}${SHLIBSUFFIX}
+ endif
+ endif
+ ifneq (${FQ_SO_DEPDOM},${FQ_REAL_DEPDOM})
+diff -urN xerces-c-src_2_7_0-orig/samples/Makefile.incl
xerces-c-src_2_7_0/samples/Makefile.incl
+--- xerces-c-src_2_7_0-orig/samples/Makefile.incl 2005-09-07
11:56:50.000000000 -0400
++++ xerces-c-src_2_7_0/samples/Makefile.incl 2007-12-08 13:26:50.000000000
-0500
+@@ -32,8 +32,8 @@
+ endif
+ THISLIB=${LIB_DIR}/${LIBNAME}
+
+-LIBRARY_NAMES=-l${LIBNAME}
+-LIBRARY_SEARCH_PATHS=-L${LIB_DIR}
++LIBRARY_NAMES=${LIB_DIR}/lib${LIBNAME}${SHLIBSUFFIX}
++LIBRARY_SEARCH_PATHS=
+
+ ifndef XERCESCOUT
+ XERCESCOUT=${XERCESCROOT}
+diff -urN xerces-c-src_2_7_0-orig/samples/runConfigure
xerces-c-src_2_7_0/samples/runConfigure
+--- xerces-c-src_2_7_0-orig/samples/runConfigure 2005-09-07
11:56:50.000000000 -0400
++++ xerces-c-src_2_7_0/samples/runConfigure 2007-12-06 09:30:46.000000000
-0500
@@ -93,17 +93,18 @@
transcoder=native # by default use native transcoder
thread=none # by default no need to have threads
@@ -49,7 +92,7 @@
#
# Now check if the options are correct or not, bail out if incorrect
-@@ -495,11 +500,11 @@
+@@ -506,11 +511,11 @@
rm -f config.log
rm -f config.status
if test $platform = "os400"; then
@@ -64,7 +107,7 @@
fi
# exit if configure failed
if test $? != 0; then
-@@ -518,7 +523,7 @@
+@@ -529,7 +534,7 @@
echo export CFLAGS=\"$CFLAGS\"
echo export LDFLAGS=\"$LDFLAGS\"
echo export EXTRA_LIBS=\"$EXTRA_LIBS\"
@@ -73,3 +116,31 @@
echo
echo If the result of the above commands look OK to you, go to the directory
+diff -urN
xerces-c-src_2_7_0-orig/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
xerces-c-src_2_7_0/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
+---
xerces-c-src_2_7_0-orig/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
2005-09-07 11:55:38.000000000 -0400
++++ xerces-c-src_2_7_0/src/xercesc/util/MsgLoaders/ICU/resources/Makefile.in
2007-12-08 13:27:34.000000000 -0500
+@@ -87,7 +87,7 @@
+ CHECK_VARS= ICU_DATA=$(RESDIR)
+
+ # DLL and static modes are identical here
+-RESLDFLAGS= -L$(RESDIR) -l$(RESNAME)
++RESLDFLAGS= $(RESDIR)/lib$(RESNAME)${SHLIBSUFFIX}
+ RESCPPFLAGS=
+ CHECK_VARS=
+
+diff -urN xerces-c-src_2_7_0-orig/tests/Makefile.incl
xerces-c-src_2_7_0/tests/Makefile.incl
+--- xerces-c-src_2_7_0-orig/tests/Makefile.incl 2005-09-07
11:56:40.000000000 -0400
++++ xerces-c-src_2_7_0/tests/Makefile.incl 2007-12-08 13:28:02.000000000
-0500
+@@ -34,9 +34,9 @@
+ endif
+ THISLIB=${LIB_DIR}/${LIBNAME}
+
+-LIBRARY_NAMES=-l${LIBNAME}
+-LIBRARY_DEPDOM=-l${LIBDEPDOM}
+-LIBRARY_SEARCH_PATHS=-L${LIB_DIR}
++LIBRARY_NAMES=${LIB_DIR}/lib${LIBNAME}${SHLIBSUFFIX}
++LIBRARY_DEPDOM=${LIB_DIR/lib${LIBDEPDOM}${SHLIBSUFFIX}
++LIBRARY_SEARCH_PATHS=
+
+ TO = o
+ ####################### PLATFORM DEPENDENCIES #####################
Index: xerces-c.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/devel/xerces-c.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xerces-c.info 17 Aug 2007 02:11:13 -0000 1.1
+++ xerces-c.info 14 Aug 2008 01:15:35 -0000 1.2
@@ -1,6 +1,6 @@
Package: xerces-c
Version: 2.7.0
-Revision: 1002
+Revision: 1003
GCC: 4.0
Maintainer: Daniel Czarnecki <[EMAIL PROTECTED]>
License: BSD
@@ -14,16 +14,21 @@
Source-MD5: 04169609449a8846bc1e6891c04cadf4
#SourceDirectory: xerces-c-src_2_7_0
Patch: %n.patch
+PatchScript: <<
+#perl -pi -e 's/(\${MAKE}) -s /\1 /' `find . -name Makefile*`
+ perl -pi -e 's/(-install_name )/-compatibility_version %v -current_version %v
\1/' src/xercesc/Makefile.incl
+<<
+NoSetMAKEFLAGS: true
+SetMAKEFLAGS: -j1
NoSetLDFLAGS: true
NoSetCPPFLAGS: true
-SetLIBRARY_PATH: %p/lib
CompileScript: <<
#!/bin/sh -ev
export XERCESCROOT=%b CPATH=%p/include
cd src/xercesc
./runConfigure -p macosx -n native -C "%c"
- make LD_SONAME="-install_name %p/lib/libxerces-c.27.dylib
-compatibility_version %v -current_version %v"
+ make
cd ../../samples
./runConfigure -p macosx -C "%c"
make
@@ -59,7 +64,7 @@
Conflicts: xerces-c23-dev, %N-dev (<< %v-%r)
Replaces: xerces-c23-dev, %N-dev (<< %v-%r)
BuildDependsOnly: True
- Depends: %N-shlibs
+ Depends: %N-shlibs (= %v-%r)
Files: include share/%N-dev lib share/doc/%N-dev
DocFiles: LICENSE*
<<
@@ -81,5 +86,11 @@
DescPort: <<
Patched samples/runConfigure to support a -C flag just like
src/xercesc/runConfigure
+
+ dmacks updated/fixed libverisoning flag hacks.
+
+ dmacks patched a lot of makefile fragments to link directly to
+ build-dir libs in order to avoid libs that might be installed already.
+ See: https://issues.apache.org/jira/browse/XERCESC-1765
<<
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
