* [gentoo-commits] gentoo-x86 commit in dev-lang/yap/files: yap-6.0.6-DESTDIR.patch yap-6.0.6-runpath.patch yap-6.0.6-ldflags.patch yap-6.0.6-chr-sublist.patch yap-6.0.6-itries.patch yap-6.0.6-yapsharedir.patch
@ 2010-09-12 6:43 Keri Harris (keri)
0 siblings, 0 replies; only message in thread
From: Keri Harris (keri) @ 2010-09-12 6:43 UTC (permalink / raw
To: gentoo-commits
keri 10/09/12 06:43:40
Added: yap-6.0.6-DESTDIR.patch yap-6.0.6-runpath.patch
yap-6.0.6-ldflags.patch yap-6.0.6-chr-sublist.patch
yap-6.0.6-itries.patch yap-6.0.6-yapsharedir.patch
Log:
Version bump
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.1 dev-lang/yap/files/yap-6.0.6-DESTDIR.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/yap/files/yap-6.0.6-DESTDIR.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/yap/files/yap-6.0.6-DESTDIR.patch?rev=1.1&content-type=text/plain
Index: yap-6.0.6-DESTDIR.patch
===================================================================
--- yap-6.orig/packages/http/Makefile.in 2010-08-05 05:36:28.000000000 +1200
+++ yap-6/packages/http/Makefile.in 2010-08-08 10:00:13.000000000 +1200
@@ -110,7 +110,7 @@
$(INSTALL_PROGRAM) $(SOLIBS) $(BINTARGET)
mkdir -p $(PLTARGET)
mkdir -p $(PLTARGET)/web/icons
- mkdir -p $(LIBDIR)/web/css
+ mkdir -p $(DESTDIR)$(LIBDIR)/web/css
$(INSTALL_DATA) $(LIBPL) $(PLTARGET)
$(INSTALL_DATA) $(srcdir)/README $(PLTARGET)
$(INSTALL_DATA) $(srcdir)/web/icons/*.png $(PLTARGET)/web/icons
--- yap-6.orig/packages/zlib/Makefile.in 2010-08-05 05:36:28.000000000 +1200
+++ yap-6/packages/zlib/Makefile.in 2010-08-08 10:06:17.000000000 +1200
@@ -107,7 +107,7 @@
$(LD) $(LDFLAGS) -o $@ $(ZOBJ) $(LIBS)
install: $(TARGETS) $(LIBPL)
- mkdir -p $(DESTDIR)$(BINTARGET)
+ mkdir -p $(BINTARGET)
for f in $(TARGETS); do \
$(INSTALL_PROGRAM) $$f $(BINTARGET); \
done
1.1 dev-lang/yap/files/yap-6.0.6-runpath.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/yap/files/yap-6.0.6-runpath.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/yap/files/yap-6.0.6-runpath.patch?rev=1.1&content-type=text/plain
Index: yap-6.0.6-runpath.patch
===================================================================
--- yap-6.orig/configure 2010-08-05 05:36:28.000000000 +1200
+++ yap-6/configure 2010-09-12 18:26:08.000000000 +1200
@@ -6820,17 +6820,17 @@
then
LIBS="$LIBS -lnsl"
fi
- LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(DESTDIR)\$(LIBDIR) -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR)"
+ LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)"
DYNYAPLIB=libYap."$SO"
if test "$dynamic_loading" = "yes"
then
YAPLIB_LD="\$(CC) -shared"
- EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR) -Wl,-R,\$(DESTDIR)\$(LIBDIR)"
+ EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)"
else
YAPLIB_LD="\$(CC)"
- EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -Wl,-R,\$(DESTDIR)\$(YAPLIBDIR) -Wl,-R,\$(DESTDIR)\$(LIBDIR)"
+ EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)"
INSTALL_ENV="YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)"
PRE_INSTALL_ENV=""
fi
1.1 dev-lang/yap/files/yap-6.0.6-ldflags.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/yap/files/yap-6.0.6-ldflags.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/yap/files/yap-6.0.6-ldflags.patch?rev=1.1&content-type=text/plain
Index: yap-6.0.6-ldflags.patch
===================================================================
diff -ur yap-6.orig/library/matrix/Makefile.in yap-6/library/matrix/Makefile.in
--- yap-6.orig/library/matrix/Makefile.in 2010-08-05 05:36:28.000000000 +1200
+++ yap-6/library/matrix/Makefile.in 2010-09-12 17:50:42.000000000 +1200
@@ -20,6 +20,7 @@
#
CC=@CC@
CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
+LDFLAGS=@LDFLAGS@
#
#
# You shouldn't need to change what follows.
@@ -47,10 +48,10 @@
$(CC) -c $(CFLAGS) $(srcdir)/matrix.c -o matrix.o
@DO_SECOND_LD@%.@SO@: %.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@matrix.@SO@: matrix.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o matrix.@SO@ matrix.o @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o matrix.@SO@ matrix.o @EXTRA_LIBS_FOR_DLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
diff -ur yap-6.orig/library/random/Makefile.in yap-6/library/random/Makefile.in
--- yap-6.orig/library/random/Makefile.in 2010-08-05 05:36:28.000000000 +1200
+++ yap-6/library/random/Makefile.in 2010-09-12 18:02:50.000000000 +1200
@@ -20,6 +20,7 @@
#
CC=@CC@
CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
+LDFLAGS=@LDFLAGS@
#
#
# You shouldn't need to change what follows.
@@ -47,10 +48,10 @@
$(CC) -c $(CFLAGS) $(srcdir)/yap_random.c -o yap_random.o
@DO_SECOND_LD@%.@SO@: %.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@yap_random.@SO@: yap_random.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o yap_random.@SO@ yap_random.o @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o yap_random.@SO@ yap_random.o @EXTRA_LIBS_FOR_DLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
diff -ur yap-6.orig/library/regex/Makefile.in yap-6/library/regex/Makefile.in
--- yap-6.orig/library/regex/Makefile.in 2010-08-05 05:36:28.000000000 +1200
+++ yap-6/library/regex/Makefile.in 2010-09-12 18:02:16.000000000 +1200
@@ -20,6 +20,7 @@
#
CC=@CC@
CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
+LDFLAGS=@LDFLAGS@
#
#
# You shouldn't need to change what follows.
@@ -59,22 +60,22 @@
$(CC) -c $(CFLAGS) $(srcdir)/regexec.c -o regexec.o
@DO_SECOND_LD@%.@SO@: %.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@regexp.@SO@: regexp.o @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o regexp.@SO@ regexp.o @EXTRA_LIBS_FOR_DLLS@ @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regexp.@SO@ regexp.o @EXTRA_LIBS_FOR_DLLS@ @MERGE_DLL_OBJS@ regcomp.o regerror.o regfree.o regexec.o
@DO_SECOND_LD@regcomp.@SO@: regcomp.o @MERGE_DLL_OBJS@ regfree.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o regcomp.@SO@ regcomp.o @MERGE_DLL_OBJS@ regfree.o @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regcomp.@SO@ regcomp.o @MERGE_DLL_OBJS@ regfree.o @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@regerror.@SO@: regerror.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o regerror.@SO@ regerror.o @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regerror.@SO@ regerror.o @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@regfree.@SO@: regfree.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o regfree.@SO@ regfree.o @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regfree.@SO@ regfree.o @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@regexec.@SO@: regexec.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o regexec.@SO@ regexec.o @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o regexec.@SO@ regexec.o @EXTRA_LIBS_FOR_DLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
diff -ur yap-6.orig/library/rltree/Makefile.in yap-6/library/rltree/Makefile.in
--- yap-6.orig/library/rltree/Makefile.in 2010-08-05 05:36:28.000000000 +1200
+++ yap-6/library/rltree/Makefile.in 2010-09-12 18:01:14.000000000 +1200
@@ -25,6 +25,7 @@
CC=@CC@
MPI_CC=mpicc
CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
+LDFLAGS=@LDFLAGS@
#
#
# You shouldn't need to change what follows.
@@ -52,10 +53,10 @@
$(CC) -c $(CFLAGS) $(srcdir)/yap_rl.c -o yaprl.o
@DO_SECOND_LD@%.@SO@: %.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@yap_rl.@SO@: $(OBJS)
-@DO_SECOND_LD@ @SHLIB_LD@ -o yap_rl.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o yap_rl.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
install: all
@if test "$(SOBJS)" = "no"; then echo ""; else $(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR); fi
diff -ur yap-6.orig/library/system/Makefile.in yap-6/library/system/Makefile.in
--- yap-6.orig/library/system/Makefile.in 2010-08-05 05:36:28.000000000 +1200
+++ yap-6/library/system/Makefile.in 2010-09-12 17:51:44.000000000 +1200
@@ -20,6 +20,7 @@
#
CC=@CC@
CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
+LDFLAGS=@LDFLAGS@
#
#
# You shouldn't need to change what follows.
@@ -47,10 +48,10 @@
$(CC) -c $(CFLAGS) $(srcdir)/sys.c -o sys.o
@DO_SECOND_LD@@DO_SECOND_LD@%.@SO@: %.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@sys.@SO@: sys.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o sys.@SO@ sys.o @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o sys.@SO@ sys.o @EXTRA_LIBS_FOR_DLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
diff -ur yap-6.orig/library/tries/Makefile.in yap-6/library/tries/Makefile.in
--- yap-6.orig/library/tries/Makefile.in 2010-08-05 05:36:28.000000000 +1200
+++ yap-6/library/tries/Makefile.in 2010-09-12 17:50:07.000000000 +1200
@@ -20,6 +20,7 @@
#
CC=@CC@
CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include
+LDFLAGS=@LDFLAGS@
#
#
# You shouldn't need to change what follows.
@@ -60,13 +61,13 @@
$(CC) -c $(CFLAGS) $(SHLIB_CFLAGS) $(srcdir)/itries.c -o itries.o
@DO_SECOND_LD@%.@SO@: %.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@tries.@SO@: core_tries.o base_tries.o tries.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o tries.@SO@ core_tries.o base_tries.o tries.o @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o tries.@SO@ core_tries.o base_tries.o tries.o @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@itries.@SO@: core_tries.o base_itries.o itries.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o itries.@SO@ core_tries.o base_itries.o itries.o @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o itries.@SO@ core_tries.o base_itries.o itries.o @EXTRA_LIBS_FOR_DLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
diff -ur yap-6.orig/packages/PLStream/Makefile.in yap-6/packages/PLStream/Makefile.in
--- yap-6.orig/packages/PLStream/Makefile.in 2010-08-05 05:36:28.000000000 +1200
+++ yap-6/packages/PLStream/Makefile.in 2010-09-12 18:07:41.000000000 +1200
@@ -21,6 +21,7 @@
#
CC=@CC@
CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
+LDFLAGS=@LDFLAGS@
#
#
# You shouldn't need to change what follows.
@@ -77,10 +78,10 @@
$(CC) -c $(CFLAGS) $< -o $@
@DO_SECOND_LD@%.@SO@: %.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @EXTRA_LIBS_FOR_DLLS@
@DO_SECOND_LD@libplstream.@SO@: $(OBJS)
-@DO_SECOND_LD@ @SHLIB_LD@ -o libplstream.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o libplstream.@SO@ $(OBJS) @EXTRA_LIBS_FOR_DLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
diff -ur yap-6.orig/packages/clib/Makefile.in yap-6/packages/clib/Makefile.in
--- yap-6.orig/packages/clib/Makefile.in 2010-08-05 05:36:28.000000000 +1200
+++ yap-6/packages/clib/Makefile.in 2010-09-12 17:57:39.000000000 +1200
@@ -37,7 +37,7 @@
CRYPTLIBS=@CLIB_CRYPTLIBS@
LD=@DO_SECOND_LD@ @SHLIB_LD@
-LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@
BINTARGET=$(DESTDIR)$(YAPLIBDIR)
PLTARGET=$(DESTDIR)$(SHAREDIR)
diff -ur yap-6.orig/packages/http/Makefile.in yap-6/packages/http/Makefile.in
--- yap-6.orig/packages/http/Makefile.in 2010-08-05 05:36:28.000000000 +1200
+++ yap-6/packages/http/Makefile.in 2010-09-12 18:04:08.000000000 +1200
@@ -38,7 +38,7 @@
#
LD=@DO_SECOND_LD@ @SHLIB_LD@
-LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@
BINTARGET=$(DESTDIR)$(YAPLIBDIR)
PLTARGET=$(DESTDIR)$(SHAREDIR)/http
diff -ur yap-6.orig/packages/jpl/Makefile.in yap-6/packages/jpl/Makefile.in
--- yap-6.orig/packages/jpl/Makefile.in 2010-08-05 05:36:46.000000000 +1200
+++ yap-6/packages/jpl/Makefile.in 2010-09-12 17:54:10.000000000 +1200
@@ -34,6 +34,7 @@
#
CC=@CC@
CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@ @JAVAINCPATH@
+LDFLAGS=@LDFLAGS@
MKINDEX=true
BINTARGET=$(DESTDIR)$(YAPLIBDIR)
PLTARGET=$(DESTDIR)$(SHAREDIR)
@@ -96,7 +97,7 @@
@DO_SECOND_LD@%.@SO@: %.o
- @DO_SECOND_LD@ @SHLIB_LD@ -o $@ $< @JAVALIBPATH@ @EXTRA_LIBS_FOR_SWIDLLS@
+ @DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o $@ $< @JAVALIBPATH@ @EXTRA_LIBS_FOR_SWIDLLS@
if [ -r libjpl.dylib ]; then \
rm -f libjpl.jnilib && ln -s libjpl.dylib libjpl.jnilib ; \
fi
diff -ur yap-6.orig/packages/semweb/Makefile.in yap-6/packages/semweb/Makefile.in
--- yap-6.orig/packages/semweb/Makefile.in 2010-08-05 05:36:28.000000000 +1200
+++ yap-6/packages/semweb/Makefile.in 2010-09-12 18:07:04.000000000 +1200
@@ -47,7 +47,7 @@
#
LD=@DO_SECOND_LD@ @SHLIB_LD@
-LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@
BINTARGET=$(DESTDIR)$(YAPLIBDIR)
PLTARGET=$(DESTDIR)$(SHAREDIR)/semweb
diff -ur yap-6.orig/packages/sgml/Makefile.in yap-6/packages/sgml/Makefile.in
--- yap-6.orig/packages/sgml/Makefile.in 2010-08-05 05:36:28.000000000 +1200
+++ yap-6/packages/sgml/Makefile.in 2010-09-12 17:53:23.000000000 +1200
@@ -30,6 +30,7 @@
#
CC=@CC@
CFLAGS= @SHLIB_CFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../.. -I$(srcdir)/../../include @CPPFLAGS@
+LDFLAGS=@LDFLAGS@
MKINDEX=true
LD=$(CC)
@@ -116,7 +117,7 @@
$(CC) $(CFLAGS) -o $@ -c $<
@DO_SECOND_LD@sgml2pl.@SO@: $(PLOBJ)
-@DO_SECOND_LD@ @SHLIB_LD@ -o sgml2pl.@SO@ $(PLOBJ) @EXTRA_LIBS_FOR_SWIDLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o sgml2pl.@SO@ $(PLOBJ) @EXTRA_LIBS_FOR_SWIDLLS@
all: $(TARGETS) $(PROGRAMS)
diff -ur yap-6.orig/packages/swi-minisat2/C/Makefile.in yap-6/packages/swi-minisat2/C/Makefile.in
--- yap-6.orig/packages/swi-minisat2/C/Makefile.in 2010-08-05 05:36:28.000000000 +1200
+++ yap-6/packages/swi-minisat2/C/Makefile.in 2010-09-12 18:10:07.000000000 +1200
@@ -22,6 +22,7 @@
CC=@CC@
CXX=@CXX@
CXXFLAGS= @SHLIB_CXXFLAGS@ $(YAP_EXTRAS) $(DEFS) -D_YAP_NOT_INSTALLED_=1 -I$(srcdir) -I../../.. -I$(srcdir)/../../../include @CPPFLAGS@
+LDFLAGS=@LDFLAGS@
#
#
# You shouldn't need to change what follows.
@@ -69,7 +70,7 @@
$(CXX) -c $(CXXFLAGS) $(srcdir)/pl-minisat.C -o pl-minisat.o
@DO_SECOND_LD@pl-minisat.@SO@: $(OBJS)
-@DO_SECOND_LD@ @SHLIB_CXX_LD@ -o pl-minisat.@SO@ $(OBJS) @EXTRA_LIBS_FOR_SWIDLLS@
+@DO_SECOND_LD@ @SHLIB_CXX_LD@ $(LDFLAGS) -o pl-minisat.@SO@ $(OBJS) @EXTRA_LIBS_FOR_SWIDLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
diff -ur yap-6.orig/packages/tai/Makefile.in yap-6/packages/tai/Makefile.in
--- yap-6.orig/packages/tai/Makefile.in 2010-08-05 05:36:28.000000000 +1200
+++ yap-6/packages/tai/Makefile.in 2010-09-12 17:52:34.000000000 +1200
@@ -20,6 +20,7 @@
#
CC=@CC@
CFLAGS= @SHLIB_CFLAGS@ -D_YAP_NOT_INSTALLED_=1 $(YAP_EXTRAS) $(DEFS) -I$(srcdir) -I../.. -I$(srcdir)/../../include -I$(srcdir)/../PLStream
+LDFLAGS=@LDFLAGS@
#
#
# You shouldn't need to change what follows.
@@ -48,7 +49,7 @@
$(CC) -c $(CFLAGS) $(srcdir)/pl-tai.c -o pl-tai.o
@DO_SECOND_LD@pl-tai.@SO@: pl-tai.o
-@DO_SECOND_LD@ @SHLIB_LD@ -o pl-tai.@SO@ pl-tai.o libtai/libtai.a @EXTRA_LIBS_FOR_SWIDLLS@
+@DO_SECOND_LD@ @SHLIB_LD@ $(LDFLAGS) -o pl-tai.@SO@ pl-tai.o libtai/libtai.a @EXTRA_LIBS_FOR_SWIDLLS@
install: all
$(INSTALL_PROGRAM) $(SOBJS) $(DESTDIR)$(YAPLIBDIR)
diff -ur yap-6.orig/packages/zlib/Makefile.in yap-6/packages/zlib/Makefile.in
--- yap-6.orig/packages/zlib/Makefile.in 2010-08-05 05:36:28.000000000 +1200
+++ yap-6/packages/zlib/Makefile.in 2010-09-12 18:06:07.000000000 +1200
@@ -45,7 +45,7 @@
#
LD=@DO_SECOND_LD@ @SHLIB_LD@
-LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@
+LDFLAGS=@EXTRA_LIBS_FOR_SWIDLLS@ @LDFLAGS@
BINTARGET=$(DESTDIR)$(YAPLIBDIR)
PLTARGET=$(DESTDIR)$(SHAREDIR)
1.1 dev-lang/yap/files/yap-6.0.6-chr-sublist.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/yap/files/yap-6.0.6-chr-sublist.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/yap/files/yap-6.0.6-chr-sublist.patch?rev=1.1&content-type=text/plain
Index: yap-6.0.6-chr-sublist.patch
===================================================================
--- yap-6.orig/library/dialect/hprolog.yap 2010-05-12 01:53:25.000000000 +1200
+++ yap-6/library/dialect/hprolog.yap 2010-05-16 09:25:26.000000000 +1200
@@ -38,7 +38,7 @@
split_at/4, % +N, +List, -FirstElements, -LastElements
max_go_list/2, % +List, -Max
or_list/2, % +ListOfInts, -BitwiseOr
- sublist/2, % ?Sublist, +List
+ chr_sublist/2, % ?Sublist, +List
bounded_sublist/3, % ?Sublist, +List, +Bound
chr_delete/3,
init_store/2,
@@ -55,9 +55,9 @@
% lookup_ht1/4
]).
-:- reexport('../lists',[sublist/2]).
+%:- reexport('../lists',[sublist/2]).
-%:- use_module(library(lists)).
+:- use_module(library(lists)).
:- use_module(library(assoc)).
/** <module> hProlog compatibility library
@@ -213,15 +213,15 @@
%
% True if all elements of Sub appear in List in the same order.
-%sublist(L, L).
-%sublist(Sub, [H|T]) :-
-% '$sublist1'(T, H, Sub).
-
-%'$sublist1'(Sub, _, Sub).
-%'$sublist1'([H|T], _, Sub) :-
-% '$sublist1'(T, H, Sub).
-%'$sublist1'([H|T], X, [X|Sub]) :-
-% '$sublist1'(T, H, Sub).
+chr_sublist(L, L).
+chr_sublist(Sub, [H|T]) :-
+ '$sublist1'(T, H, Sub).
+
+'$sublist1'(Sub, _, Sub).
+'$sublist1'([H|T], _, Sub) :-
+ '$sublist1'(T, H, Sub).
+'$sublist1'([H|T], X, [X|Sub]) :-
+ '$sublist1'(T, H, Sub).
%% bounded_sublist(?Sub, +List, +Bound:integer)
%
1.1 dev-lang/yap/files/yap-6.0.6-itries.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/yap/files/yap-6.0.6-itries.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/yap/files/yap-6.0.6-itries.patch?rev=1.1&content-type=text/plain
Index: yap-6.0.6-itries.patch
===================================================================
--- yap-6.orig/library/tries/itries.c 2010-08-05 05:36:28.000000000 +1200
+++ yap-6/library/tries/itries.c 2010-09-12 17:20:09.000000000 +1200
@@ -620,7 +620,7 @@
/* check args */
if (!YAP_IsVarTerm(arg_itrie))
return FALSE;
- if (!(file = (FILE*) Yap_FileDescriptorFromStream(arg_stream)))
+ if (!(file = (FILE*) YAP_FileDescriptorFromStream(arg_stream)))
return FALSE;
/* load itrie */
1.1 dev-lang/yap/files/yap-6.0.6-yapsharedir.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/yap/files/yap-6.0.6-yapsharedir.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/yap/files/yap-6.0.6-yapsharedir.patch?rev=1.1&content-type=text/plain
Index: yap-6.0.6-yapsharedir.patch
===================================================================
--- yap-6.orig/pl/consult.yap 2010-05-12 01:53:25.000000000 +1200
+++ yap-6/pl/consult.yap 2010-05-16 09:26:41.000000000 +1200
@@ -872,9 +872,9 @@
atom_concat([Path,File],PFile).
'$system_library_directories'(Dir) :-
- getenv('YAPSHAREDIR', Dir).
+ getenv('YAPSHAREDIR', Dir), !.
'$system_library_directories'(Dir) :-
- getenv('YAPCOMMONSDIR', Dir).
+ getenv('YAPCOMMONSDIR', Dir), !.
'$system_library_directories'(Dir) :-
get_value(system_library_directory,Dir).
'$system_library_directories'(Dir) :-
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-09-12 6:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-12 6:43 [gentoo-commits] gentoo-x86 commit in dev-lang/yap/files: yap-6.0.6-DESTDIR.patch yap-6.0.6-runpath.patch yap-6.0.6-ldflags.patch yap-6.0.6-chr-sublist.patch yap-6.0.6-itries.patch yap-6.0.6-yapsharedir.patch Keri Harris (keri)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox