Browse Source

fix binutils (#511)

* fix binutils

* fix binutils

* Update fedora.yml

* improve binutils
ruki 4 years ago
parent
commit
c450ab9350
2 changed files with 8 additions and 2 deletions
  1. 1 1
      .github/workflows/fedora.yml
  2. 7 1
      packages/b/binutils/xmake.lua

+ 1 - 1
.github/workflows/fedora.yml

@@ -35,6 +35,6 @@ jobs:
         env:
           XMAKE_ROOT: y
         run: |
-          xmake l ./scripts/test.lua -D -k ${{ matrix.kind }}
+          xmake l ./scripts/test.lua -D -k ${{ matrix.kind }} -j1
 
 

+ 7 - 1
packages/b/binutils/xmake.lua

@@ -1,10 +1,10 @@
 package("binutils")
 
+    set_kind("binary")
     set_homepage("https://www.gnu.org/software/binutils/binutils.html")
     set_description("GNU binary tools for native development")
     set_license("GPL-2.0")
 
-    set_kind("binary")
     set_urls("https://ftp.gnu.org/gnu/binutils/binutils-$(version).tar.xz",
              "https://ftpmirror.gnu.org/binutils/binutils-$(version).tar.xz")
 
@@ -26,6 +26,12 @@ package("binutils")
             table.insert(configs, "--enable-gold")
             table.insert(configs, "--enable-plugins")
         end
+        -- fix 'makeinfo' is missing on your system.
+        io.replace("binutils/Makefile.in", "SUBDIRS = doc po", "SUBDIRS = ")
+        -- fix multiple definition of `program_name'
+        io.replace("binutils/srconv.c", "char *program_name;", "extern char *program_name;", {plain = true})
+        io.replace("binutils/sysdump.c", "char *program_name;", "extern char *program_name;", {plain = true})
+        io.replace("binutils/coffdump.c", "char * program_name;", "extern char *program_name;", {plain = true})
         import("package.tools.autoconf").install(package, configs)
     end)