Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Keri Harris (keri)" <keri@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lang/gprolog/files: gprolog-1.4.1-txt-file.patch gprolog-1.4.1-nodocs.patch gprolog-1.4.1-ldflags.patch gprolog-1.4.1-links.patch
Date: Mon, 02 Jul 2012 11:53:04
Message-Id: 20120702115249.D74EC2004B@flycatcher.gentoo.org
1 keri 12/07/02 11:52:49
2
3 Added: gprolog-1.4.1-txt-file.patch
4 gprolog-1.4.1-nodocs.patch
5 gprolog-1.4.1-ldflags.patch
6 gprolog-1.4.1-links.patch
7 Log:
8 Version bump
9
10 (Portage version: 2.1.10.65/cvs/Linux x86_64)
11
12 Revision Changes Path
13 1.1 dev-lang/gprolog/files/gprolog-1.4.1-txt-file.patch
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gprolog/files/gprolog-1.4.1-txt-file.patch?rev=1.1&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gprolog/files/gprolog-1.4.1-txt-file.patch?rev=1.1&content-type=text/plain
17
18 Index: gprolog-1.4.1-txt-file.patch
19 ===================================================================
20 --- gprolog-1.4.1.orig/src/Makefile.in 2012-01-10 18:24:39.000000000 +0100
21 +++ gprolog-1.4.1/src/Makefile.in 2012-07-02 12:55:39.000000000 +0200
22 @@ -60,7 +60,6 @@
23 install-system:
24 ./mkinstalldirs $(INSTALL_DIR) $(INSTALL_DIR)/bin \
25 $(INSTALL_DIR)/include $(INSTALL_DIR)/lib
26 - for i in $(TXT_FILES); do $(INSTALL_DATA) ../$$i $(INSTALL_DIR); done
27 for i in $(BIN_FILES); do $(INSTALL_PROGRAM) */$$i $(INSTALL_DIR)/bin; done
28 for i in $(OBJ_FILES); do $(INSTALL_DATA) */$$i $(INSTALL_DIR)/lib; done
29 for i in $(LIB_FILES); do $(INSTALL_DATA) */$$i $(INSTALL_DIR)/lib; done
30
31
32
33 1.1 dev-lang/gprolog/files/gprolog-1.4.1-nodocs.patch
34
35 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gprolog/files/gprolog-1.4.1-nodocs.patch?rev=1.1&view=markup
36 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gprolog/files/gprolog-1.4.1-nodocs.patch?rev=1.1&content-type=text/plain
37
38 Index: gprolog-1.4.1-nodocs.patch
39 ===================================================================
40 --- gprolog-1.4.1.orig/src/Makefile.in 2012-01-10 18:24:39.000000000 +0100
41 +++ gprolog-1.4.1/src/Makefile.in 2012-07-02 12:53:42.000000000 +0200
42 @@ -97,7 +97,7 @@
43 # --- Documentation --- #
44
45 install-doc:
46 - if test $(DOC_DIR) != none; then \
47 + if test $(DOC_DIR) != $(DESTDIR)none; then \
48 ./mkinstalldirs $(DOC_DIR); \
49 (F=`cd ../doc; echo $(DOC_FILES)`; \
50 for i in $$F; do $(INSTALL_DATA) ../doc/$$i $(DOC_DIR); done); \
51 @@ -113,7 +113,7 @@
52 # --- HTML --- #
53
54 install-html:
55 - if test $(HTML_DIR) != none; then \
56 + if test $(HTML_DIR) != $(DESTDIR)none; then \
57 ./mkinstalldirs $(HTML_DIR); \
58 (F=`cd ../doc/html_node; echo $(HTML_FILES)`; \
59 for i in $$F; do $(INSTALL_DATA) ../doc/html_node/$$i $(HTML_DIR); done); \
60 @@ -129,7 +129,7 @@
61 # --- Examples --- #
62
63 install-examples:
64 - if test $(EXAMPLES_DIR) != none; then \
65 + if test $(EXAMPLES_DIR) != $(DESTDIR)none; then \
66 ./mkinstalldirs $(EXAMPLES_DIR)/ExamplesPl; \
67 (F=`cd ../examples/ExamplesPl; echo $(EXPL_FILES)`; \
68 for i in $$F; do $(INSTALL_DATA) ../examples/ExamplesPl/$$i $(EXAMPLES_DIR)/ExamplesPl; done); \
69
70
71
72 1.1 dev-lang/gprolog/files/gprolog-1.4.1-ldflags.patch
73
74 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gprolog/files/gprolog-1.4.1-ldflags.patch?rev=1.1&view=markup
75 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gprolog/files/gprolog-1.4.1-ldflags.patch?rev=1.1&content-type=text/plain
76
77 Index: gprolog-1.4.1-ldflags.patch
78 ===================================================================
79 diff -ur gprolog-1.4.1.orig/src/Ma2Asm/Makefile.in gprolog-1.4.1/src/Ma2Asm/Makefile.in
80 --- gprolog-1.4.1.orig/src/Ma2Asm/Makefile.in 2012-01-10 18:24:39.000000000 +0100
81 +++ gprolog-1.4.1/src/Ma2Asm/Makefile.in 2012-07-02 13:08:11.000000000 +0200
82 @@ -19,7 +19,7 @@
83
84 ma2asm@EXE_SUFFIX@: ma2asm@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@ \
85 ma2asm_inst@OBJ_SUFFIX@ ma2asm_inst.c
86 - $(CC) $(CFLAGS) @CC_EXE_NAME_OPT@ma2asm@EXE_SUFFIX@ ma2asm@OBJ_SUFFIX@ ma2asm_inst@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@
87 + $(CC) $(LDFLAGS) @CC_EXE_NAME_OPT@ma2asm@EXE_SUFFIX@ ma2asm@OBJ_SUFFIX@ ma2asm_inst@OBJ_SUFFIX@ ma_parser@OBJ_SUFFIX@
88
89
90 clean:
91 diff -ur gprolog-1.4.1.orig/src/TopComp/Makefile.in gprolog-1.4.1/src/TopComp/Makefile.in
92 --- gprolog-1.4.1.orig/src/TopComp/Makefile.in 2012-01-10 18:24:39.000000000 +0100
93 +++ gprolog-1.4.1/src/TopComp/Makefile.in 2012-07-02 13:08:11.000000000 +0200
94 @@ -15,10 +15,10 @@
95
96 $(GPLC)@EXE_SUFFIX@: top_comp.c copying.c ../EnginePl/wam_regs.h \
97 ../EnginePl/gp_config.h ../EnginePl/machine1.c decode_hexa.c copying.c prolog_path.c
98 - $(CC) $(CFLAGS) @CC_EXE_NAME_OPT@$(GPLC)@EXE_SUFFIX@ top_comp.c $(LDLIBS)
99 + $(CC) $(LDFLAGS) $(CFLAGS) @CC_EXE_NAME_OPT@$(GPLC)@EXE_SUFFIX@ top_comp.c $(LDLIBS)
100
101 $(HEXGPLC)@EXE_SUFFIX@: hexfilter.c decode_hexa.c
102 - $(CC) $(CFLAGS) @CC_EXE_NAME_OPT@$(HEXGPLC)@EXE_SUFFIX@ hexfilter.c
103 + $(CC) $(LDFLAGS) $(CFLAGS) @CC_EXE_NAME_OPT@$(HEXGPLC)@EXE_SUFFIX@ hexfilter.c
104
105
106
107 diff -ur gprolog-1.4.1.orig/src/Wam2Ma/Makefile.in gprolog-1.4.1/src/Wam2Ma/Makefile.in
108 --- gprolog-1.4.1.orig/src/Wam2Ma/Makefile.in 2012-01-10 18:24:38.000000000 +0100
109 +++ gprolog-1.4.1/src/Wam2Ma/Makefile.in 2012-07-02 13:08:11.000000000 +0200
110 @@ -12,7 +12,7 @@
111 $(CC) $(CFLAGS) -c wam2ma.c
112
113 wam2ma@EXE_SUFFIX@: wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
114 - $(CC) $(CFLAGS) @CC_EXE_NAME_OPT@wam2ma@EXE_SUFFIX@ wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
115 + $(CC) $(LDFLAGS) @CC_EXE_NAME_OPT@wam2ma@EXE_SUFFIX@ wam2ma@OBJ_SUFFIX@ wam_parser@OBJ_SUFFIX@
116
117
118 clean:
119
120
121
122 1.1 dev-lang/gprolog/files/gprolog-1.4.1-links.patch
123
124 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gprolog/files/gprolog-1.4.1-links.patch?rev=1.1&view=markup
125 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/gprolog/files/gprolog-1.4.1-links.patch?rev=1.1&content-type=text/plain
126
127 Index: gprolog-1.4.1-links.patch
128 ===================================================================
129 --- gprolog-1.4.1.orig/src/Makefile.in 2012-01-10 18:24:39.000000000 +0100
130 +++ gprolog-1.4.1/src/Makefile.in 2012-07-02 13:38:49.000000000 +0200
131 @@ -81,10 +81,10 @@
132
133 # --- Links --- #
134
135 -install-links: uninstall-links
136 +install-links:
137 if test $(LINKS_DIR) != none; then \
138 ./mkinstalldirs $(LINKS_DIR); \
139 - (cd $(LINKS_DIR) ; $(LN_S) $(INSTALL_DIR)/bin/* .); \
140 + (cd $(LINKS_DIR); for i in $(BIN_FILES); do $(LN_S) $(INSTALL_DIR)/bin/$$i .; done); \
141 fi
142
143 uninstall-links:
Report Message
Find on MARC Find on Google Groups