Skip to content

Commit

Permalink
[libx11] Optimize Build (#38319)
Browse files Browse the repository at this point in the history
- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [x] The "supports" clause reflects platforms that may be fixed by this
new version.
- [x] Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.
- [x] Any patches that are no longer applied are deleted from the port's
directory.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.

To beat:
- x64-windows: 28 min
- x86-windows: 28 min
- x64-windows-static-md: 26 min
- x64-windows-static: 26 min
- arm64-windows: 26 min
  • Loading branch information
Thomas1664 authored Apr 23, 2024
1 parent 30036b4 commit 6ab3314
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 7 deletions.
13 changes: 13 additions & 0 deletions ports/libx11/optimize-configure.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/Makefile.am b/Makefile.am
index b14f9d78..2df82fe3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ else
ORDER=modules src
endif
# Order: nls before specs
-SUBDIRS=include $(ORDER) nls man specs
+SUBDIRS=include $(ORDER) nls

ACLOCAL_AMFLAGS = -I m4

12 changes: 7 additions & 5 deletions ports/libx11/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@ vcpkg_from_gitlab(
REF 3a30ada60c5217ada37b143b541c8e6f6284c7fa
SHA512 441f86ff8293d27459feaa93f85bcd4d02c6bd64fdb4d95199e5ee8a75340c2ce9b0fccd0b05840ce0de30ff3af3d21e6f37c81840e82b37dbddf082911b585d
HEAD_REF master
PATCHES cl.build.patch
io_include.patch
${PATCHES}
vcxserver.patch
add_dl_pc.patch
PATCHES
optimize-configure.patch
cl.build.patch
io_include.patch
${PATCHES}
vcxserver.patch
add_dl_pc.patch
)

set(ENV{ACLOCAL} "aclocal -I \"${CURRENT_INSTALLED_DIR}/share/xorg/aclocal/\"")
Expand Down
2 changes: 1 addition & 1 deletion ports/libx11/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "libx11",
"version": "1.8.1",
"port-version": 1,
"port-version": 2,
"description": "The X Window System is a network-transparent window system that was designed at MIT.",
"homepage": "https://www.x.org/wiki/",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5166,7 +5166,7 @@
},
"libx11": {
"baseline": "1.8.1",
"port-version": 1
"port-version": 2
},
"libxau": {
"baseline": "1.0.9",
Expand Down
5 changes: 5 additions & 0 deletions versions/l-/libx11.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4fda1cb1b842b106895d2ab377ec91cc9c39e932",
"version": "1.8.1",
"port-version": 2
},
{
"git-tree": "990f02cb9422412f2c71e9f3b4616a7331d65fe6",
"version": "1.8.1",
Expand Down

0 comments on commit 6ab3314

Please sign in to comment.