openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1777218 - in /openoffice/trunk: ext_libraries/apr-util/makefile.mk ext_libraries/apr-util/prj/d.lst main/RepositoryExternal.mk
Date Tue, 03 Jan 2017 20:40:48 GMT
Author: damjan
Date: Tue Jan  3 20:40:48 2017
New Revision: 1777218

URL: http://svn.apache.org/viewvc?rev=1777218&view=rev
Log:
Deliver some missing header files for internal apr-util, such as
apu_version.h needed by main/ucb, and use the correct include paths for
internal apr and apr-util.

Patch by: me


Modified:
    openoffice/trunk/ext_libraries/apr-util/makefile.mk
    openoffice/trunk/ext_libraries/apr-util/prj/d.lst
    openoffice/trunk/main/RepositoryExternal.mk

Modified: openoffice/trunk/ext_libraries/apr-util/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr-util/makefile.mk?rev=1777218&r1=1777217&r2=1777218&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/apr-util/makefile.mk (original)
+++ openoffice/trunk/ext_libraries/apr-util/makefile.mk Tue Jan  3 20:40:48 2017
@@ -110,7 +110,7 @@ INSTALL_ACTION=if [ -f apu-1-config.orig
 	chmod +x apu-1-config
 
 OUT2INC+=include$/apr*.h
-OUT2INC+=include$/apu.h
+OUT2INC+=include$/apu*.h
 OUT2INC_SUBDIR=apr-util
 
 .IF "$(OS)"=="MACOSX"

Modified: openoffice/trunk/ext_libraries/apr-util/prj/d.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/apr-util/prj/d.lst?rev=1777218&r1=1777217&r2=1777218&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/apr-util/prj/d.lst (original)
+++ openoffice/trunk/ext_libraries/apr-util/prj/d.lst Tue Jan  3 20:40:48 2017
@@ -1,6 +1,6 @@
 mkdir: %_DEST%\inc%_EXT%\apr-util
 ..\%__SRC%\inc\apr-util\apr*.h %_DEST%\inc%_EXT%\apr-util
-..\%__SRC%\inc\apr-util\apu.h %_DEST%\inc%_EXT%\apr-util
+..\%__SRC%\inc\apr-util\apu*.h %_DEST%\inc%_EXT%\apr-util
 ..\aprutil_version.mk %_DEST%\inc%_EXT%
 
 # Unixes

Modified: openoffice/trunk/main/RepositoryExternal.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/RepositoryExternal.mk?rev=1777218&r1=1777217&r2=1777218&view=diff
==============================================================================
--- openoffice/trunk/main/RepositoryExternal.mk (original)
+++ openoffice/trunk/main/RepositoryExternal.mk Tue Jan  3 20:40:48 2017
@@ -382,6 +382,10 @@ $(eval $(call gb_Helper_register_librari
 ))
 
 define gb_LinkTarget__use_apr
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc/apr \
+)
 $(call gb_LinkTarget_add_linked_libs,$(1),\
 	apr-1 \
 )
@@ -410,6 +414,10 @@ $(eval $(call gb_Helper_register_librari
 ))
 
 define gb_LinkTarget__use_apr_util
+$(call gb_LinkTarget_set_include,$(1),\
+	$$(INCLUDE) \
+	-I$(OUTDIR)/inc/apr-util \
+)
 $(call gb_LinkTarget_add_linked_libs,$(1),\
 	aprutil-1 \
 )



Mime
View raw message