diff options
| author | Peter Foley <pefoley2@verizon.net> | 2011-10-01 15:08:58 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2011-10-01 18:34:50 -0400 |
| commit | fb6a64d8fc6a93b52a10fad5516918fed9482f22 (patch) | |
| tree | 9d89c246af76a9ae367401933dbeca9877c1ba92 | |
| parent | 2f6dc09c05857ddc6238a425d64ab63577e90ec7 (diff) | |
make libcmis build aginst internal cppunit
| -rw-r--r-- | cppunit/makefile.mk | 2 | ||||
| -rw-r--r-- | cppunit/prj/d.lst | 3 | ||||
| -rw-r--r-- | solenv/gbuild/ExternalLib.mk | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk index a136e343cd90..913504c063ee 100644 --- a/cppunit/makefile.mk +++ b/cppunit/makefile.mk @@ -144,7 +144,7 @@ CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS) BUILD_FLAGS = install -OUTDIR2INC = ooo-install/include/cppunit +OUTDIR2INC = ooo-install/include/cppunit ooo-install/lib/pkgconfig OUT2BIN = ooo-install/bin/DllPlugInTester .IF "$(OS)" == "MACOSX" diff --git a/cppunit/prj/d.lst b/cppunit/prj/d.lst index 1cfdb55e5587..97e710d446b9 100644 --- a/cppunit/prj/d.lst +++ b/cppunit/prj/d.lst @@ -36,3 +36,6 @@ symlink: %_DEST%\lib\libcppunit-1.12.a %_DEST%\lib\libcppunit.a ..\%__SRC%\bin\DllPlugInTester %_DEST%\bin\DllPlugInTester ..\%__SRC%\bin\DllPlugInTester.exe %_DEST%\bin\DllPlugInTester.exe ..\%__SRC%\bin\DllPlugInTester_dll.exe %_DEST%\bin\DllPlugInTester_dll.exe + +mkdir: %_DEST%\lib\pkgconfig +..\%__SRC%\inc\pkgconfig\cppunit.pc %_DEST%\lib\pkgconfig\cppunit.pc diff --git a/solenv/gbuild/ExternalLib.mk b/solenv/gbuild/ExternalLib.mk index 142968fb0ec7..07d45b617c05 100644 --- a/solenv/gbuild/ExternalLib.mk +++ b/solenv/gbuild/ExternalLib.mk @@ -97,7 +97,7 @@ define gb_ExternalLib__command_autotools mkdir -p $(call gb_ExternalLib_get_builddir,$(1)) && \ tar -x -C $(call gb_ExternalLib_get_builddir,$(1)) --strip-component=1 -f $< && \ pushd $(call gb_ExternalLib_get_builddir,$(1)) && for p in $(T_PATCHES) ; do patch -p 1 < $(gb_REPOS)/$$p || exit 1; done && \ - CC="$(gb_CC)" CXX="$(gb_CXX)" CFLAGS="$(T_CFLAGS)" CXXFLAGS="$(T_CXXFLAGS)" ./configure --prefix=$(OUTDIR) $(T_CONF_ARGS) && \ + CC="$(gb_CC)" CXX="$(gb_CXX)" CFLAGS="$(T_CFLAGS)" CXXFLAGS="$(T_CXXFLAGS)" PKG_CONFIG_PATH="$(OUTDIR)/lib/pkgconfig" ./configure --prefix=$(OUTDIR) $(T_CONF_ARGS) && \ for p in $(T_POST_PATCHES) ; do patch -p 1 < $(gb_REPOS)/$p || exit 1; done #we don't want a deployed rpath pointing into our solver, to-do, set correct ORIGIN-foo ? pushd $(call gb_ExternalLib_get_builddir,$(1)) && if test -e libtool ; then sed -i 's,^hardcode_libdir_flag_spec=.*,hardcode_libdir_flag_spec="",g' libtool && sed -i 's,^runpath_var=LD_RUN_PATH,runpath_var=DIE_RPATH_DIE,g' libtool; fi |