| 1 |
jlec 12/06/21 09:07:53 |
| 2 |
|
| 3 |
Added: metakit-2.4.9.7-linking.patch |
| 4 |
Log: |
| 5 |
dev-db/metakit: Fix linking, #252474 |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-db/metakit/files/metakit-2.4.9.7-linking.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/metakit/files/metakit-2.4.9.7-linking.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/metakit/files/metakit-2.4.9.7-linking.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: metakit-2.4.9.7-linking.patch |
| 16 |
=================================================================== |
| 17 |
unix/Makefile.in | 10 +++++----- |
| 18 |
1 files changed, 5 insertions(+), 5 deletions(-) |
| 19 |
|
| 20 |
diff --git a/unix/Makefile.in b/unix/Makefile.in |
| 21 |
index bf187ba..763558f 100755 |
| 22 |
--- a/unix/Makefile.in |
| 23 |
+++ b/unix/Makefile.in |
| 24 |
@@ -43,7 +43,7 @@ CXX_FLAGS = @CPPFLAGS@ @CXXFLAGS@ @MK_THREADS@ @SHLIB_CFLAGS@ \ |
| 25 |
# (e.g. in Mk4py). This does not affect standard operation, *only* errors. |
| 26 |
# Happens in gcc 2.95.3, it has been disabled for now (even though slower). |
| 27 |
#CXXFLAGS = -fomit-frame-pointer $(CXX_FLAGS) |
| 28 |
-CXXFLAGS = $(CXX_FLAGS) |
| 29 |
+CXXFLAGS += -I$(srcdir)/../include |
| 30 |
#CXXFLAGS = -Dq4_CHECK $(CXX_FLAGS) |
| 31 |
#CXXFLAGS = -Wall -pedantic -Wno-unused $(CXX_FLAGS) |
| 32 |
|
| 33 |
@@ -134,24 +134,24 @@ libmk4$(LIB_SUFFIX): $(LOBJS) |
| 34 |
ranlib $@ |
| 35 |
|
| 36 |
libmk4$(SHLIB_SUFFIX): $(LOBJS) $(LINK_SPECIAL_FILES) |
| 37 |
- $(SHLIB_LD) -o $@ $(LOBJS) $(LINK_SPECIAL_FLAGS) |
| 38 |
+ $(SHLIB_LD) $(LDFLAGS) -o $@ $(LOBJS) $(LINK_SPECIAL_FLAGS) |
| 39 |
|
| 40 |
Mk4tcl$(LIB_SUFFIX): mk4tcl.o mk4too.o $(LOBJS) |
| 41 |
ar rcu $@ mk4tcl.o mk4too.o $(LOBJS) |
| 42 |
ranlib $@ |
| 43 |
|
| 44 |
Mk4tcl$(SHLIB_SUFFIX): mk4tcl.o mk4too.o $(LOBJS) $(LINK_SPECIAL_FILES) |
| 45 |
- $(SHLIB_LD) -o $@ mk4tcl.o mk4too.o $(LOBJS) $(LINK_SPECIAL_FLAGS) |
| 46 |
+ $(SHLIB_LD) $(LDFLAGS) -o $@ mk4tcl.o mk4too.o $(LOBJS) $(LINK_SPECIAL_FLAGS) |
| 47 |
|
| 48 |
Mk4py$(LIB_SUFFIX): $(PYOBJS) $(LOBJS) |
| 49 |
ar cru $@ $(PYOBJS) $(LOBJS) |
| 50 |
ranlib $@ |
| 51 |
|
| 52 |
Mk4py$(SHLIB_SUFFIX): $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FILES) |
| 53 |
- $(SHLIB_LD) -o $@ $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FLAGS) |
| 54 |
+ $(SHLIB_LD) $(LDFLAGS) -o $@ $(PYOBJS) -L. -lmk4 $(LINK_SPECIAL_FLAGS) $(PYTHON_LIB) |
| 55 |
|
| 56 |
Mk4lua$(SHLIB_SUFFIX): mk4lua.o $(LOBJS) $(LINK_SPECIAL_FILES) |
| 57 |
- $(SHLIB_LD) -o $@ mk4lua.o $(LOBJS) $(LINK_SPECIAL_FLAGS) |
| 58 |
+ $(SHLIB_LD) $(LDFLAGS) -o $@ mk4lua.o $(LOBJS) $(LINK_SPECIAL_FLAGS) |
| 59 |
|
| 60 |
demo: $(srcdir)/../demos/demo.cpp libmk4$(LIBEXT) |
| 61 |
$(CXX) $(CXX_SWITCHES) -o $@$(EXEEXT) \ |
Archives