diff options
author | joerg <joerg@pkgsrc.org> | 2009-11-25 23:41:42 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2009-11-25 23:41:42 +0000 |
commit | deddee74e0d3408005334267c505107c362fecd2 (patch) | |
tree | b70d622cf40d36af535dbe8c5829b1cc41e162cc /devel/ode/patches | |
parent | 0deaea2dc003dc73f68775aeeb24e07bd07e7fe5 (diff) | |
download | pkgsrc-deddee74e0d3408005334267c505107c362fecd2.tar.gz |
Prepare for libtool-2.2: needs explicit --tag as it is using g++.
Diffstat (limited to 'devel/ode/patches')
-rw-r--r-- | devel/ode/patches/patch-aa | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/devel/ode/patches/patch-aa b/devel/ode/patches/patch-aa index 407aa68f100..9acafe0c215 100644 --- a/devel/ode/patches/patch-aa +++ b/devel/ode/patches/patch-aa @@ -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 @@ $NetBSD: patch-aa,v 1.1 2006/02/10 20:35:28 adam Exp $ # 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 @@ $NetBSD: patch-aa,v 1.1 2006/02/10 20:35:28 adam Exp $ %$(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) |