[pkgsrc/trunk]: pkgsrc/devel/ode Prepare for libtool-2.2: needs explicit --ta...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3d2ee223efad
branches:  trunk
changeset: 567837:3d2ee223efad
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Nov 25 23:41:42 2009 +0000

description:
Prepare for libtool-2.2: needs explicit --tag as it is using g++.

diffstat:

 devel/ode/distinfo         |  4 ++--
 devel/ode/patches/patch-aa |  8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (46 lines):

diff -r 21dde25a1563 -r 3d2ee223efad devel/ode/distinfo
--- a/devel/ode/distinfo        Wed Nov 25 23:31:58 2009 +0000
+++ b/devel/ode/distinfo        Wed Nov 25 23:41:42 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2008/10/02 17:53:36 joerg Exp $
+$NetBSD: distinfo,v 1.7 2009/11/25 23:41:42 joerg Exp $
 
 SHA1 (ode-0.5.tgz) = f13756f1192d24101b6d1a3c14feb43efbf0b281
 RMD160 (ode-0.5.tgz) = 3410a842731c1bb24f306f4d23509533664321aa
 Size (ode-0.5.tgz) = 1710720 bytes
-SHA1 (patch-aa) = 216a15a8ebfd7195215e1396ac94c4508fafbf30
+SHA1 (patch-aa) = 1e3efc6076b03bbdb0d9f14487d2a951267c974c
 SHA1 (patch-ab) = 87b7914946fca9362ab7334525b6c982b9981cad
 SHA1 (patch-ac) = 858cfe364bbfe5b637d63b564a54e4615fcf2f85
diff -r 21dde25a1563 -r 3d2ee223efad devel/ode/patches/patch-aa
--- a/devel/ode/patches/patch-aa        Wed Nov 25 23:31:58 2009 +0000
+++ b/devel/ode/patches/patch-aa        Wed Nov 25 23:41:42 2009 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2006/02/10 20:35:28 adam Exp $
+$NetBSD: patch-aa,v 1.2 2009/11/25 23:41:42 joerg Exp $
 
 --- Makefile.orig      2004-05-18 20:07:45.000000000 +0200
 +++ Makefile
@@ -7,7 +7,7 @@
  #   if we have no command-line-length limitation, directly specify all
  #   object files to be linked.
 -      $(ODE_LIB_AR_RULE) $(ODE_OBJECTS)
-+      ${LIBTOOL} --mode=link ${CC} -o ${ODE_LIB:.a=.la} \
++      ${LIBTOOL} --mode=link --tag=CXX ${CC} -o ${ODE_LIB:.a=.la} \
 +              ${ODE_OBJECTS:.o=.lo} -rpath ${PREFIX}/lib -version-info 0:5
  endif
  
@@ -17,11 +17,11 @@
  
  %$(OBJ): %.c
 -      $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $<
-+      ${LIBTOOL} --mode=compile $(CC) $(C_FLAGS) $(CFLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $<
++      ${LIBTOOL} --mode=compile --tag=CC $(CC) $(C_FLAGS) $(CFLAGS) $(C_INC)$(INCPATH) $(DEFINES) $(C_OPT)1 $(C_OUT)$@ $<
  
  %$(OBJ): %.cpp
 -      $(CC) $(C_FLAGS) $(C_INC)$(INCPATH) $(INC_OPCODE) $(DEFINES) $(C_OPT)$(OPT) $(C_OUT)$@ $<
-+      ${LIBTOOL} --mode=compile $(CC) $(C_FLAGS) $(CFLAGS) $(C_INC)$(INCPATH) $(INC_OPCODE) $(DEFINES) $(C_OPT)$(OPT) $(C_OUT)$@ $<
++      ${LIBTOOL} --mode=compile --tag=CXX $(CC) $(C_FLAGS) $(CFLAGS) $(C_INC)$(INCPATH) $(INC_OPCODE) $(DEFINES) $(C_OPT)$(OPT) $(C_OUT)$@ $<
  
  %.exe: %$(OBJ)
        $(CC) $(C_EXEOUT)$@ $< $(ODE_LIB) $(DRAWSTUFF_LIB) $(RESOURCE_FILE) $(LINK_OPENGL) $(LINK_MATH)