/[ascend]/trunk/tools/ipopt/ipopt-addlibs.patch
ViewVC logotype

Contents of /trunk/tools/ipopt/ipopt-addlibs.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2652 - (show annotations) (download) (as text)
Thu Dec 13 09:03:18 2012 UTC (7 years, 3 months ago) by jpye
File MIME type: text/x-diff
File size: 1485 byte(s)
Added support for IPOPT in RPM for Fedora 17.
1 diff -uNr Ipopt-3.10.3-orig/Ipopt/Makefile.am Ipopt-3.10.3/Ipopt/Makefile.am
2 --- Ipopt-3.10.3-orig/Ipopt/Makefile.am 2011-08-14 20:57:59.000000000 +1000
3 +++ Ipopt-3.10.3/Ipopt/Makefile.am 2012-12-13 19:24:19.457463910 +1100
4 @@ -151,7 +151,7 @@
5 install-data-hook:
6 @$(mkdir_p) "$(addlibsdir)"
7 if COIN_HAS_PKGCONFIG
8 - PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
9 + PKG_CONFIG_PATH=$(DESTDIR)$(libdir)/pkgconfig:@COIN_PKG_CONFIG_PATH@ \
10 $(PKG_CONFIG) --libs ipopt > $(addlibsdir)/ipopt_addlibs_cpp.txt
11 else
12 if COIN_CXX_IS_CL
13 diff -uNr Ipopt-3.10.3-orig/Ipopt/Makefile.in Ipopt-3.10.3/Ipopt/Makefile.in
14 --- Ipopt-3.10.3-orig/Ipopt/Makefile.in 2011-08-14 20:57:59.000000000 +1000
15 +++ Ipopt-3.10.3/Ipopt/Makefile.in 2012-12-13 19:42:55.846876112 +1100
16 @@ -1063,7 +1063,7 @@
17 # since pkg-config may have reordered the flags from FLIBS, we take them out one by one
18 install-data-hook:
19 @$(mkdir_p) "$(addlibsdir)"
20 -@COIN_HAS_PKGCONFIG_TRUE@ PKG_CONFIG_PATH=@COIN_PKG_CONFIG_PATH@ \
21 +@COIN_HAS_PKGCONFIG_TRUE@ PKG_CONFIG_PATH=$$DESTDIR$(libdir)/pkgconfig:@COIN_PKG_CONFIG_PATH@ \
22 @COIN_HAS_PKGCONFIG_TRUE@ $(PKG_CONFIG) --libs ipopt > $(addlibsdir)/ipopt_addlibs_cpp.txt
23 @COIN_CXX_IS_CL_TRUE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libipopt.lib @IPOPTLIB_LIBS_INSTALLED@" > $(addlibsdir)/ipopt_addlibs_cpp.txt
24 @COIN_CXX_IS_CL_FALSE@@COIN_HAS_PKGCONFIG_FALSE@ echo "-L@abs_lib_dir@ -lipopt @IPOPTLIB_LIBS_INSTALLED@" > $(addlibsdir)/ipopt_addlibs_cpp.txt

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22