Commit bd5278c7 authored by Ed Reel's avatar Ed Reel Committed by GitHub

Add missing flex dependency to binutils (#5754)

Add binutils, flex and py3_pip to core packages

Remove crew_profile_base and binutils from buildessential
parent 0de05b00
...@@ -21,8 +21,8 @@ EARLY_PACKAGES="gcc10 brotli c_ares libcyrussasl libidn2 libmetalink libnghttp2 ...@@ -21,8 +21,8 @@ EARLY_PACKAGES="gcc10 brotli c_ares libcyrussasl libidn2 libmetalink libnghttp2
libtirpc libunistring openldap rtmpdump zstd ncurses ca_certificates libyaml ruby libffi \ libtirpc libunistring openldap rtmpdump zstd ncurses ca_certificates libyaml ruby libffi \
openssl nettle krb5 p11kit libtasn1 gnutls curl git icu4c" openssl nettle krb5 p11kit libtasn1 gnutls curl git icu4c"
LATE_PACKAGES="crew_profile_base less most manpages filecmd mawk readline perl pcre pcre2 python27 python3 \ LATE_PACKAGES="binutils crew_profile_base less most manpages filecmd mawk readline perl pcre pcre2 \
sed bz2 lz4 lzip unzip xzutils zip" python27 python3 py3_pip sed bz2 lz4 lzip unzip xzutils zip"
ARCH="$(uname -m)" ARCH="$(uname -m)"
......
...@@ -23,6 +23,8 @@ class Binutils < Package ...@@ -23,6 +23,8 @@ class Binutils < Package
x86_64: '784c5e9bfd884c411708ae3c2ee1c852022f411794ff109fb7d37e91f124037b' x86_64: '784c5e9bfd884c411708ae3c2ee1c852022f411794ff109fb7d37e91f124037b'
}) })
depends_on 'flex'
def self.patch def self.patch
system 'filefix' system 'filefix'
system "sed -i 's,scriptdir = \$(tooldir)/lib,scriptdir = \$(tooldir)/#{ARCH_LIB},g' ld/Makefile.am" system "sed -i 's,scriptdir = \$(tooldir)/lib,scriptdir = \$(tooldir)/#{ARCH_LIB},g' ld/Makefile.am"
......
...@@ -3,19 +3,15 @@ require 'package' ...@@ -3,19 +3,15 @@ require 'package'
class Buildessential < Package class Buildessential < Package
description 'A collection of tools essential to compile and build software.' description 'A collection of tools essential to compile and build software.'
homepage '' homepage ''
version '1.13' version '1.14'
license 'GPL-3+' license 'GPL-3+'
compatibility 'all' compatibility 'all'
is_fake is_fake
# Some package installs won't work without this # install first to get ldconfig
depends_on 'crew_profile_base'
#install first to get ldconfig
depends_on 'glibc' depends_on 'glibc'
depends_on 'gcc10' depends_on 'gcc10'
depends_on 'binutils'
depends_on 'gmp' depends_on 'gmp'
depends_on 'mpfr' depends_on 'mpfr'
depends_on 'mpc' depends_on 'mpc'
......
acl acl
attr attr
binutils
brotli brotli
bz2 bz2
c_ares c_ares
...@@ -7,6 +8,7 @@ ca_certificates ...@@ -7,6 +8,7 @@ ca_certificates
crew_profile_base crew_profile_base
curl curl
filecmd filecmd
flex
gcc10 gcc10
gdbm gdbm
gettext gettext
...@@ -44,6 +46,7 @@ p11kit ...@@ -44,6 +46,7 @@ p11kit
pcre pcre
pcre2 pcre2
perl perl
py3_pip
python27 python27
python3 python3
readline readline
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment