[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - RepositoryExternal.mk

Jan-Marek Glogowski glogow at fbihome.de
Thu Nov 3 21:26:27 UTC 2016


 RepositoryExternal.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 47fbca7e9f0c0eeab0b71fa7a8a60536c40a28d2
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Thu Nov 3 13:14:42 2016 +0100

    Fix external libjpeg build
    
    (cherry picked from commit f144d319d58cbb0d358250540cd666d9644f5fa5)
    
    RepositoryExternal.mk: really fix jpeg build
    (cherry picked from commit 8d1c80e2633b8a63050cdd81b7e089f27b996c0f)
    Change-Id: I1969db554d156e6af0975d03013ea4f7c10d839f
    Reviewed-on: https://gerrit.libreoffice.org/30527
    Reviewed-by: Jean-Baptiste Faure <jbfaure at libreoffice.org>
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index da99332..24bbab7 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -464,13 +464,13 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\
 	jpeg \
 )
 
+endef
+
 define gb_ExternalProject__use_jpeg
 $(call gb_ExternalProject_use_static_libraries,$(1),jpeg)
 
 endef
 
-endef
-
 endif # SYSTEM_JPEG
 
 ifneq ($(SYSTEM_MYTHES),)


More information about the Libreoffice-commits mailing list