Import of pkgsrc-2015Q3
This commit is contained in:
@@ -0,0 +1,22 @@
|
||||
$NetBSD: patch-external_libmspub_ExternalProject__libmspub.mk,v 1.1 2015/09/16 21:12:39 he Exp $
|
||||
|
||||
Pick up and apply some diffs based on
|
||||
|
||||
http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?id=57cfb98d1c45259f946ff3444eeb6891a030e063
|
||||
|
||||
which makes libreoffice43 build with boost 1.59.
|
||||
|
||||
--- external/libmspub/ExternalProject_libmspub.mk.orig 2015-04-20 19:36:29.000000000 +0000
|
||||
+++ external/libmspub/ExternalProject_libmspub.mk
|
||||
@@ -35,7 +35,10 @@ $(call gb_ExternalProject_get_state_targ
|
||||
--disable-werror \
|
||||
--disable-weffc \
|
||||
$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
|
||||
- CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
|
||||
+ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) \
|
||||
+ -DBOOST_ERROR_CODE_HEADER_ONLY \
|
||||
+ -DBOOST_SYSTEM_NO_DEPRECATED \
|
||||
+ -I$(BUILDDIR)/config_$(gb_Side))" \
|
||||
$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
|
||||
&& $(MAKE) \
|
||||
)
|
||||
Reference in New Issue
Block a user