public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gprolog/files/
@ 2017-07-19 17:19 Keri Harris
  0 siblings, 0 replies; 3+ messages in thread
From: Keri Harris @ 2017-07-19 17:19 UTC (permalink / raw
  To: gentoo-commits

commit:     9d405ed30e391af8106a96bec42025bd7d753313
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 19 17:19:28 2017 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Wed Jul 19 17:19:28 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d405ed3

dev-lang/gprolog: correctly name GPLC PIC patch

 .../files/{gprolog-pic-code.patch => gprolog-1.4.4-pic-code.patch}        | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-lang/gprolog/files/gprolog-pic-code.patch b/dev-lang/gprolog/files/gprolog-1.4.4-pic-code.patch
similarity index 100%
rename from dev-lang/gprolog/files/gprolog-pic-code.patch
rename to dev-lang/gprolog/files/gprolog-1.4.4-pic-code.patch


^ permalink raw reply	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gprolog/files/
@ 2022-11-26 12:19 Keri Harris
  0 siblings, 0 replies; 3+ messages in thread
From: Keri Harris @ 2022-11-26 12:19 UTC (permalink / raw
  To: gentoo-commits

commit:     9938a9f418166aac77505654f75ea83e83c64e5c
Author:     Keri Harris <keri <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 26 12:18:46 2022 +0000
Commit:     Keri Harris <keri <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 12:18:46 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9938a9f4

dev-lang/gprolog: use relative symlinks for gprolog binaries

Thanks to Arsen Arsenovic for diagnosing the root cause of this.

Closes: https://bugs.gentoo.org/882519
Signed-off-by: Keri Harris <keri <AT> gentoo.org>

 dev-lang/gprolog/files/gprolog-1.4.5-links.patch   | 2 +-
 dev-lang/gprolog/files/gprolog-1.5.0-destdir.patch | 2 +-
 dev-lang/gprolog/files/gprolog-1.5.0-links.patch   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-lang/gprolog/files/gprolog-1.4.5-links.patch b/dev-lang/gprolog/files/gprolog-1.4.5-links.patch
index c39a1cf9a28c..573e27910bd0 100644
--- a/dev-lang/gprolog/files/gprolog-1.4.5-links.patch
+++ b/dev-lang/gprolog/files/gprolog-1.4.5-links.patch
@@ -9,7 +9,7 @@
  	if test $(LINKS_DIR) != none; then \
  	   ./mkinstalldirs $(LINKS_DIR); \
 -	   (cd $(LINKS_DIR) ; $(LN_S) $(INSTALL_DIR)/bin/* .); \
-+	   (cd $(LINKS_DIR); for i in $(BIN_FILES); do $(LN_S) $(INSTALL_DIR)/bin/$$i .; done); \
++	   (cd $(LINKS_DIR); for i in $(BIN_FILES); do $(LN_S) -r $(INSTALL_DIR)/bin/$$i .; done); \
  	fi
  
  uninstall-links:

diff --git a/dev-lang/gprolog/files/gprolog-1.5.0-destdir.patch b/dev-lang/gprolog/files/gprolog-1.5.0-destdir.patch
index 86719e1bdcb4..c875edd0ec18 100644
--- a/dev-lang/gprolog/files/gprolog-1.5.0-destdir.patch
+++ b/dev-lang/gprolog/files/gprolog-1.5.0-destdir.patch
@@ -7,7 +7,7 @@
 -	if test $(LINKS_DIR) != none; then \
 +	if test @LINKS_DIR@ != none; then \
  	   ./mkinstalldirs $(LINKS_DIR); \
- 	   (cd $(LINKS_DIR) ; $(LN_S) $(wildcard $(INSTALL_DIR)/bin/*) .); \
+ 	   (cd $(LINKS_DIR) ; $(LN_S) -r $(wildcard $(INSTALL_DIR)/bin/*) .); \
  	fi
  
  uninstall-links:

diff --git a/dev-lang/gprolog/files/gprolog-1.5.0-links.patch b/dev-lang/gprolog/files/gprolog-1.5.0-links.patch
index e1f673156e46..70f18610f04b 100644
--- a/dev-lang/gprolog/files/gprolog-1.5.0-links.patch
+++ b/dev-lang/gprolog/files/gprolog-1.5.0-links.patch
@@ -9,7 +9,7 @@
  	if test $(LINKS_DIR) != none; then \
  	   ./mkinstalldirs $(LINKS_DIR); \
 -	   (cd $(LINKS_DIR) ; $(LN_S) $(INSTALL_DIR)/bin/* .); \
-+	   (cd $(LINKS_DIR) ; $(LN_S) $(wildcard $(INSTALL_DIR)/bin/*) .); \
++	   (cd $(LINKS_DIR) ; $(LN_S) -r $(wildcard $(INSTALL_DIR)/bin/*) .); \
  	fi
  
  uninstall-links:


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lang/gprolog/files/
@ 2024-05-24 23:35 Conrad Kostecki
  0 siblings, 0 replies; 3+ messages in thread
From: Conrad Kostecki @ 2024-05-24 23:35 UTC (permalink / raw
  To: gentoo-commits

commit:     f68a6a1a48c0119d197fb7ee26f2feebc0775191
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun May 19 10:51:47 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Fri May 24 23:35:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f68a6a1a

dev-lang/gprolog: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../gprolog/files/gprolog-1.4.5-check-boot.patch   | 11 ------
 dev-lang/gprolog/files/gprolog-1.4.5-ldflags.patch | 40 ----------------------
 dev-lang/gprolog/files/gprolog-1.4.5-links.patch   | 15 --------
 dev-lang/gprolog/files/gprolog-1.4.5-llvm-as.patch | 38 --------------------
 dev-lang/gprolog/files/gprolog-1.4.5-nodocs.patch  | 29 ----------------
 .../gprolog/files/gprolog-1.4.5-txt-file.patch     | 10 ------
 6 files changed, 143 deletions(-)

diff --git a/dev-lang/gprolog/files/gprolog-1.4.5-check-boot.patch b/dev-lang/gprolog/files/gprolog-1.4.5-check-boot.patch
deleted file mode 100644
index a2b9638872fb..000000000000
--- a/dev-lang/gprolog/files/gprolog-1.4.5-check-boot.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gprolog-1.4.5.orig/src/Pl2Wam/check_boot	2012-12-07 03:09:23.000000000 +0100
-+++ gprolog-1.4.5/src/Pl2Wam/check_boot	2018-09-01 12:56:38.385276112 +0200
-@@ -13,7 +13,7 @@
- 
- rm_make() {
-     rm -f $*
--    make >/tmp/make.log 2>&1 || (echo /tmp/make.log ; exit 1)
-+    make >make.log 2>&1 || (echo make.log ; exit 1)
- }
- 
- 

diff --git a/dev-lang/gprolog/files/gprolog-1.4.5-ldflags.patch b/dev-lang/gprolog/files/gprolog-1.4.5-ldflags.patch
deleted file mode 100644
index 05bdb8e366a4..000000000000
--- a/dev-lang/gprolog/files/gprolog-1.4.5-ldflags.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -urN gprolog-1.4.5.orig/src/Ma2Asm/Makefile.in gprolog-1.4.5/src/Ma2Asm/Makefile.in
---- gprolog-1.4.5.orig/src/Ma2Asm/Makefile.in	2015-01-13 19:00:19.000000000 +0100
-+++ gprolog-1.4.5/src/Ma2Asm/Makefile.in	2018-07-22 11:20:29.622236171 +0200
-@@ -19,7 +19,7 @@
- 
- ma2asm@EXE_SUFFIX@: ma2asm@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@ \
-                     ma2asm_inst@OBJ_SUFFIX@ ma2asm_inst.c
--	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@ma2asm@EXE_SUFFIX@ ma2asm@OBJ_SUFFIX@ ma2asm_inst@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@
-+	$(CC) $(LDFLAGS) @CC_EXE_NAME_OPT@ma2asm@EXE_SUFFIX@ ma2asm@OBJ_SUFFIX@ ma2asm_inst@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@
- 
- 
- clean:
-diff -urN gprolog-1.4.5.orig/src/TopComp/Makefile.in gprolog-1.4.5/src/TopComp/Makefile.in
---- gprolog-1.4.5.orig/src/TopComp/Makefile.in	2018-07-14 10:19:12.000000000 +0200
-+++ gprolog-1.4.5/src/TopComp/Makefile.in	2018-07-22 11:20:29.622236171 +0200
-@@ -23,10 +23,10 @@
- 
- $(GPLC)@EXE_SUFFIX@: top_comp.c copying.c ../EnginePl/wam_regs.h \
-          ../EnginePl/gp_config.h ../EnginePl/machine1.c decode_hexa.c copying.c prolog_path.c
--	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@$(GPLC)@EXE_SUFFIX@ top_comp.c $(LDLIBS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) @CC_EXE_NAME_OPT@$(GPLC)@EXE_SUFFIX@ top_comp.c $(LDLIBS)
- 
- $(HEXGPLC)@EXE_SUFFIX@: hexfilter.c decode_hexa.c
--	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@$(HEXGPLC)@EXE_SUFFIX@ hexfilter.c
-+	$(CC) $(LDFLAGS) $(CFLAGS) @CC_EXE_NAME_OPT@$(HEXGPLC)@EXE_SUFFIX@ hexfilter.c
- 
- 
- 
-diff -urN gprolog-1.4.5.orig/src/Wam2Ma/Makefile.in gprolog-1.4.5/src/Wam2Ma/Makefile.in
---- gprolog-1.4.5.orig/src/Wam2Ma/Makefile.in	2015-01-05 11:11:29.000000000 +0100
-+++ gprolog-1.4.5/src/Wam2Ma/Makefile.in	2018-07-22 11:20:29.622236171 +0200
-@@ -12,7 +12,7 @@
- 	$(CC) $(CFLAGS) -c wam2ma.c
- 
- wam2ma@EXE_SUFFIX@: wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
--	$(CC) $(CFLAGS) @CC_EXE_NAME_OPT@wam2ma@EXE_SUFFIX@ wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
-+	$(CC) $(LDFLAGS) @CC_EXE_NAME_OPT@wam2ma@EXE_SUFFIX@ wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
- 
- 
- clean:

diff --git a/dev-lang/gprolog/files/gprolog-1.4.5-links.patch b/dev-lang/gprolog/files/gprolog-1.4.5-links.patch
deleted file mode 100644
index 573e27910bd0..000000000000
--- a/dev-lang/gprolog/files/gprolog-1.4.5-links.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gprolog-1.4.5.orig/src/Makefile.in	2018-07-14 10:19:12.000000000 +0200
-+++ gprolog-1.4.5/src/Makefile.in	2018-07-22 11:41:15.762184054 +0200
-@@ -81,10 +81,10 @@
- 
- # --- Links --- #
- 
--install-links: uninstall-links
-+install-links:
- 	if test $(LINKS_DIR) != none; then \
- 	   ./mkinstalldirs $(LINKS_DIR); \
--	   (cd $(LINKS_DIR) ; $(LN_S) $(INSTALL_DIR)/bin/* .); \
-+	   (cd $(LINKS_DIR); for i in $(BIN_FILES); do $(LN_S) -r $(INSTALL_DIR)/bin/$$i .; done); \
- 	fi
- 
- uninstall-links:

diff --git a/dev-lang/gprolog/files/gprolog-1.4.5-llvm-as.patch b/dev-lang/gprolog/files/gprolog-1.4.5-llvm-as.patch
deleted file mode 100644
index 6adc8feb2720..000000000000
--- a/dev-lang/gprolog/files/gprolog-1.4.5-llvm-as.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- gprolog-1.4.5.orig/src/configure.in	2018-07-14 08:19:12.000000000 -0000
-+++ gprolog-1.4.5/src/configure.in	2021-06-27 10:13:31.004977355 -0000
-@@ -334,15 +334,26 @@
- dnl we use AS0 instead of AS else AC_CHECK_TOOL does not work 
- dnl (instead of testing a prefix like x86_64-w64-mingw32- it will
- dnl think the user wants to override the test)
--    AS0=as
--    case "$host" in
--        sparc64*bsd*)    ASFLAGS='-Av9a -64 -K PIC';;
--        i*86*darwin1*)   ASFLAGS='-arch i686';;
--        i*86*linux*)     ASFLAGS='--32';;
--        x86_64*solaris*) AS0=gas; ASFLAGS='--64';;
--        x86_64*darwin*)  ASFLAGS='-arch x86_64';;
--        x86_64*linux*)   ASFLAGS='--64';;
--        *)               if test "$with_gas" = yes; then AS0=gas; fi;;
-+    case "$CC" in
-+        *cc)
-+            AS0=as
-+            case "$host" in
-+                sparc64*bsd*)    ASFLAGS='-Av9a -64 -K PIC';;
-+                i*86*darwin1*)   ASFLAGS='-arch i686';;
-+                i*86*linux*)     ASFLAGS='--32';;
-+                x86_64*solaris*) AS0=gas; ASFLAGS='--64';;
-+                x86_64*darwin*)  ASFLAGS='-arch x86_64';;
-+                x86_64*linux*)   ASFLAGS='--64';;
-+                *)               if test "$with_gas" = yes; then AS0=gas; fi;;
-+            esac
-+            ;;
-+        *clang)
-+            AS0=$CC
-+            ASFLAGS='-c'
-+            ;;
-+        *)
-+            AC_MSG_ERROR([unsupported compiler $CC])
-+            ;;
-     esac
-     AC_CHECK_TOOL([AS],[$AS0])
-     AC_PROG_RANLIB

diff --git a/dev-lang/gprolog/files/gprolog-1.4.5-nodocs.patch b/dev-lang/gprolog/files/gprolog-1.4.5-nodocs.patch
deleted file mode 100644
index c5c517b1887a..000000000000
--- a/dev-lang/gprolog/files/gprolog-1.4.5-nodocs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- gprolog-1.4.5.orig/src/Makefile.in	2018-07-14 10:19:12.000000000 +0200
-+++ gprolog-1.4.5/src/Makefile.in	2018-07-22 11:59:54.877137249 +0200
-@@ -97,7 +97,7 @@
- # --- Documentation --- #
- 
- install-doc:
--	if test $(DOC_DIR) != none; then \
-+	if test $(DOC_DIR) != $(DESTDIR)none; then \
- 	   ./mkinstalldirs $(DOC_DIR); \
- 	   (F=`cd ../doc; echo $(DOC_FILES)`; \
- 	   for i in $$F; do $(INSTALL_DATA) ../doc/$$i $(DOC_DIR); done); \
-@@ -113,7 +113,7 @@
- # --- HTML --- #
- 
- install-html:
--	if test $(HTML_DIR) != none; then \
-+	if test $(HTML_DIR) != $(DESTDIR)none; then \
- 	   ./mkinstalldirs $(HTML_DIR); \
- 	   (F=`cd ../doc/html_node; echo $(HTML_FILES)`; \
- 	   for i in $$F; do $(INSTALL_DATA) ../doc/html_node/$$i $(HTML_DIR); done); \
-@@ -129,7 +129,7 @@
- # --- Examples --- #
- 
- install-examples:
--	if test $(EXAMPLES_DIR) != none; then \
-+	if test $(EXAMPLES_DIR) != $(DESTDIR)none; then \
- 	   ./mkinstalldirs $(EXAMPLES_DIR)/ExamplesPl; \
- 	   (F=`cd ../examples/ExamplesPl; echo $(EXPL_FILES)`; \
- 	   for i in $$F; do $(INSTALL_DATA) ../examples/ExamplesPl/$$i $(EXAMPLES_DIR)/ExamplesPl; done); \

diff --git a/dev-lang/gprolog/files/gprolog-1.4.5-txt-file.patch b/dev-lang/gprolog/files/gprolog-1.4.5-txt-file.patch
deleted file mode 100644
index e385e948129b..000000000000
--- a/dev-lang/gprolog/files/gprolog-1.4.5-txt-file.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- gprolog-1.4.5.orig/src/Makefile.in	2018-07-14 10:19:12.000000000 +0200
-+++ gprolog-1.4.5/src/Makefile.in	2018-07-22 11:56:09.247146686 +0200
-@@ -60,7 +60,6 @@
- install-system:
- 	./mkinstalldirs $(INSTALL_DIR) $(INSTALL_DIR)/bin \
- 	$(INSTALL_DIR)/include $(INSTALL_DIR)/lib
--	for i in $(TXT_FILES); do $(INSTALL_DATA) ../$$i $(INSTALL_DIR); done
- 	for i in $(BIN_FILES); do $(INSTALL_PROGRAM) */$$i $(INSTALL_DIR)/bin; done
- 	for i in $(OBJ_FILES); do $(INSTALL_DATA) */$$i $(INSTALL_DIR)/lib; done
- 	for i in $(LIB_FILES); do $(INSTALL_DATA) */$$i $(INSTALL_DIR)/lib; done


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-05-24 23:35 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-26 12:19 [gentoo-commits] repo/gentoo:master commit in: dev-lang/gprolog/files/ Keri Harris
  -- strict thread matches above, loose matches on Subject: below --
2024-05-24 23:35 Conrad Kostecki
2017-07-19 17:19 Keri Harris

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox