Bläddra i källkod

add xcb-proto and fix python

ruki 4 år sedan
förälder
incheckning
f1e3d18d9d
3 ändrade filer med 26 tillägg och 4 borttagningar
  1. 2 2
      packages/p/python/xmake.lua
  2. 2 2
      packages/p/python2/xmake.lua
  3. 22 0
      packages/x/xcb-proto/xmake.lua

+ 2 - 2
packages/p/python/xmake.lua

@@ -120,7 +120,7 @@ package("python")
         local ldflags = {}
         if package:is_plat("macosx") then
             local xcode_dir     = get_config("xcode")
-            local xcode_sdkver  = get_config("xcode_sdkver")
+            local xcode_sdkver  = get_config("xcode_sdkver") or get_config("xcode_sdkver_macosx")
             if xcode_dir and xcode_sdkver then
                 -- help Python's build system (setuptools/pip) to build things on SDK-based systems
                 -- the setup.py looks at "-isysroot" to get the sysroot (and not at --sysroot)
@@ -135,7 +135,7 @@ package("python")
             end
 
             -- avoid linking to libgcc https://mail.python.org/pipermail/python-dev/2012-February/116205.html
-            local target_minver = get_config("target_minver")
+            local target_minver = get_config("target_minver") or get_config("target_minver_macosx")
             if target_minver then
                 table.insert(configs, "MACOSX_DEPLOYMENT_TARGET=" .. target_minver)
             end

+ 2 - 2
packages/p/python2/xmake.lua

@@ -90,7 +90,7 @@ package("python2")
         local ldflags = {}
         if package:is_plat("macosx") then
             local xcode_dir     = get_config("xcode")
-            local xcode_sdkver  = get_config("xcode_sdkver")
+            local xcode_sdkver  = get_config("xcode_sdkver") or get_config("xcode_sdkver_macosx")
             if xcode_dir and xcode_sdkver then
                 -- help Python's build system (setuptools/pip) to build things on SDK-based systems
                 -- the setup.py looks at "-isysroot" to get the sysroot (and not at --sysroot)
@@ -105,7 +105,7 @@ package("python2")
             end
 
             -- avoid linking to libgcc https://mail.python.org/pipermail/python-dev/2012-February/116205.html
-            local target_minver = get_config("target_minver")
+            local target_minver = get_config("target_minver") or get_config("target_minver_macosx")
             if target_minver then
                 table.insert(configs, "MACOSX_DEPLOYMENT_TARGET=" .. target_minver)
             end

+ 22 - 0
packages/x/xcb-proto/xmake.lua

@@ -0,0 +1,22 @@
+package("xcb-proto")
+
+    set_homepage("https://www.x.org/")
+    set_description("X.Org: XML-XCB protocol descriptions for libxcb code generation")
+
+    set_urls("https://xcb.freedesktop.org/dist/xcb-proto-$(version).tar.bz2")
+    add_versions("1.13", "7b98721e669be80284e9bbfeab02d2d0d54cd11172b72271e47a2fe875e2bde1")
+
+    add_deps("autoconf", "python 3.x")
+
+    on_install("macosx", "linux", function (package)
+        local configs = {"--sysconfdir=" .. package:installdir("etc"),
+                         "--localstatedir=" .. package:installdir("var"),
+                         "--disable-silent-rules",
+                         "PYTHON=python3"}
+        import("package.tools.autoconf").install(package, configs)
+    end)
+
+    on_test(function (package)
+        local envs = {PKG_CONFIG_PATH = path.join(package:installdir(), "lib", "pkgconfig")}
+        os.vrunv("pkg-config", {"--exists", "xcb-proto"}, {envs = envs})
+    end)