[Libreoffice-commits] core.git: external/libgltf

Stephan Bergmann sbergman at redhat.com
Wed Jun 25 23:55:02 PDT 2014


 external/libgltf/ExternalProject_libgltf.mk |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit fb48904dfa640e93650264aa9913dea2305dbcc6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Jun 26 08:53:32 2014 +0200

    Revert "external/libgltf: Hack in missing -fPIC"
    
    This reverts commit 5da85a21241f09a0b2d7796bc952806a1a863592,
    bb9078e3dee48afc4c2bd8006a892924f8b38b39 "libgltf: use --with-pick [sic]" had
    already added --with-pic.

diff --git a/external/libgltf/ExternalProject_libgltf.mk b/external/libgltf/ExternalProject_libgltf.mk
index 3b0bc87..580c010 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -63,7 +63,6 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
 			BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) -I$(BUILDDIR)/config_$(gb_Side)" \
 			GLEW_CFLAGS="$(if $(SYSTEM_GLEW),$(GLEW_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,glew)/include)" \
 			GLM_CFLAGS="$(if $(SYSTEM_GLM),$(GLM_CFLAGS),-I$(call gb_UnpackedTarball_get_dir,glm))" \
-			$(if $(filter WNT,$(OS)),,CC="$(CC) -fPIC") \
 		&& $(MAKE) \
 	)
 


More information about the Libreoffice-commits mailing list