Gentoo Logo
Gentoo Spaceship




Note: Due to technical difficulties, the Archives are currently not up to date. GMANE provides an alternative service for most mailing lists.
c.f. bug 424647
List Archive: gentoo-commits
Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Headers:
To: gentoo-commits@g.o
From: "Justin Lecher (jlec)" <jlec@g.o>
Subject: gentoo-x86 commit in dev-db/metakit/files: metakit-2.4.9.7-linking.patch
Date: Thu, 21 Jun 2012 09:07:53 +0000 (UTC)
jlec        12/06/21 09:07:53

  Added:                metakit-2.4.9.7-linking.patch
  Log:
  dev-db/metakit: Fix linking, #252474
  
  (Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-db/metakit/files/metakit-2.4.9.7-linking.patch

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
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

Index: metakit-2.4.9.7-linking.patch
===================================================================
 unix/Makefile.in |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/unix/Makefile.in b/unix/Makefile.in
index bf187ba..763558f 100755
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -43,7 +43,7 @@ CXX_FLAGS = @CPPFLAGS@ @CXXFLAGS@ @MK_THREADS@ @SHLIB_CFLAGS@ \
 # (e.g. in Mk4py).  This does not affect standard operation, *only* errors.
 # Happens in gcc 2.95.3, it has been disabled for now (even though slower).
 #CXXFLAGS = -fomit-frame-pointer $(CXX_FLAGS)
-CXXFLAGS = $(CXX_FLAGS)
+CXXFLAGS +=   -I$(srcdir)/../include
 #CXXFLAGS = -Dq4_CHECK $(CXX_FLAGS)
 #CXXFLAGS = -Wall -pedantic -Wno-unused $(CXX_FLAGS)
 
@@ -134,24 +134,24 @@ libmk4$(LIB_SUFFIX): $(LOBJS)
 	ranlib $@
 
 libmk4$(SHLIB_SUFFIX): $(LOBJS) $(LINK_SPECIAL_FILES)
-	$(SHLIB_LD) -o $@ $(LOBJS) $(LINK_SPECIAL_FLAGS)
+	$(SHLIB_LD) $(LDFLAGS) -o $@ $(LOBJS) $(LINK_SPECIAL_FLAGS)
 
 Mk4tcl$(LIB_SUFFIX): mk4tcl.o mk4too.o $(LOBJS)
 	ar rcu $@ mk4tcl.o mk4too.o $(LOBJS)
 	ranlib $@
 
 Mk4tcl$(SHLIB_SUFFIX): mk4tcl.o mk4too.o $(LOBJS) $(LINK_SPECIAL_FILES)
-	$(SHLIB_LD) -o $@ mk4tcl.o mk4too.o $(LOBJS) $(LINK_SPECIAL_FLAGS)
+	$(SHLIB_LD) $(LDFLAGS) -o $@ mk4tcl.o mk4too.o $(LOBJS) $(LINK_SPECIAL_FLAGS)
 
 Mk4py$(LIB_SUFFIX): $(PYOBJS) $(LOBJS)
 	ar cru $@ $(PYOBJS) $(LOBJS)
 	ranlib $@
 
 Mk4py$(SHLIB_SUFFIX): $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FILES)
-	$(SHLIB_LD) -o $@ $(PYOBJS) $(LOBJS) $(LINK_SPECIAL_FLAGS)
+	$(SHLIB_LD) $(LDFLAGS) -o $@ $(PYOBJS) -L. -lmk4 $(LINK_SPECIAL_FLAGS) $(PYTHON_LIB)
 
 Mk4lua$(SHLIB_SUFFIX): mk4lua.o $(LOBJS) $(LINK_SPECIAL_FILES)
-	$(SHLIB_LD) -o $@ mk4lua.o $(LOBJS) $(LINK_SPECIAL_FLAGS)
+	$(SHLIB_LD) $(LDFLAGS) -o $@ mk4lua.o $(LOBJS) $(LINK_SPECIAL_FLAGS)
 
 demo: $(srcdir)/../demos/demo.cpp libmk4$(LIBEXT)
 	$(CXX) $(CXX_SWITCHES) -o $@$(EXEEXT) \





Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
gentoo-x86 commit in dev-libs/libusbx: ChangeLog libusbx-1.0.11.ebuild
Next by thread:
gentoo-x86 commit in dev-db/metakit: metadata.xml ChangeLog metakit-2.4.9.7-r1.ebuild
Previous by date:
gentoo-x86 commit in dev-libs/libusbx: ChangeLog libusbx-1.0.11.ebuild
Next by date:
gentoo-x86 commit in dev-db/metakit: metadata.xml ChangeLog metakit-2.4.9.7-r1.ebuild


Updated Jun 26, 2012

Summary: Archive of the gentoo-commits mailing list.

Donate to support our development efforts.

Copyright 2001-2013 Gentoo Foundation, Inc. Questions, Comments? Contact us.