Skip to content

C
chromebrew
Commit d26b9c9a authored by Ed Reel's avatar Ed Reel Committed by GitHub
Browse files
Options

rm iconv.h (conflict with glibc) (#4761) 

Co-authored-by: default avatarsatmandu <satadru@umich.edu>
parent c10b9f36
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 17 deletions
install.sh
View file @ d26b9c9a
......@@ -56,8 +56,8 @@ case "${ARCH}" in
sha256s+=('fb85ed9ab22dc4ba7533b67365b56d9ee666580472898432adf3d27d2a20fe3e')
urls+=('https://dl.bintray.com/chromebrew/chromebrew/libcyrussasl-2.1.27-1-chromeos-armv7l.tar.xz')
sha256s+=('281ac03fa4841ff2bd2395e960a9803791fac3ccfa0bf70ec7b8f79088c25817')
urls+=('https://dl.bintray.com/chromebrew/chromebrew/libiconv-1.16-2-chromeos-armv7l.tar.xz')
sha256s+=('83ebdeb7420ca8b5b52cb92b0367d708dc1bbcdf08acc6044004b474b2b7e606')
urls+=('https://dl.bintray.com/chromebrew/chromebrew/libiconv-1.16-3-chromeos-armv7l.tar.xz')
sha256s+=('653edc555a8a094bcee3bbd3ee8b4a88200c4f4e285df132bdaff4e3af6088cb')
urls+=('https://dl.bintray.com/chromebrew/chromebrew/libidn2-2.0.5-chromeos-armv7l.tar.xz')
sha256s+=('533ce10819b7a6e59302480c895d7da9f498a187218296c2debee09a85b7f87d')
urls+=('https://dl.bintray.com/chromebrew/chromebrew/libmbedtls-2.16.8-chromeos-armv7l.tar.xz')
......@@ -102,8 +102,8 @@ case "${ARCH}" in
sha256s+=('fb85ed9ab22dc4ba7533b67365b56d9ee666580472898432adf3d27d2a20fe3e')
urls+=('https://dl.bintray.com/chromebrew/chromebrew/libcyrussasl-2.1.27-1-chromeos-armv7l.tar.xz')
sha256s+=('281ac03fa4841ff2bd2395e960a9803791fac3ccfa0bf70ec7b8f79088c25817')
urls+=('https://dl.bintray.com/chromebrew/chromebrew/libiconv-1.16-2-chromeos-armv7l.tar.xz')
sha256s+=('83ebdeb7420ca8b5b52cb92b0367d708dc1bbcdf08acc6044004b474b2b7e606')
urls+=('https://dl.bintray.com/chromebrew/chromebrew/libiconv-1.16-3-chromeos-armv7l.tar.xz')
sha256s+=('653edc555a8a094bcee3bbd3ee8b4a88200c4f4e285df132bdaff4e3af6088cb')
urls+=('https://dl.bintray.com/chromebrew/chromebrew/libidn2-2.0.5-chromeos-armv7l.tar.xz')
sha256s+=('533ce10819b7a6e59302480c895d7da9f498a187218296c2debee09a85b7f87d')
urls+=('https://dl.bintray.com/chromebrew/chromebrew/libmbedtls-2.16.8-chromeos-armv7l.tar.xz')
......@@ -144,8 +144,8 @@ case "${ARCH}" in
sha256s+=('00ea353730432d9b86c9ddbe05774c2fdcc13dd3cc820c31871410b6d43178f1')
urls+=('https://dl.bintray.com/chromebrew/chromebrew/libcyrussasl-2.1.27-1-chromeos-i686.tar.xz')
sha256s+=('dbce3fbbf6efedd4c9266c14163022ca9a1da22386f55eeffe6074c341a5bac0')
urls+=('https://dl.bintray.com/chromebrew/chromebrew/libiconv-1.16-2-chromeos-i686.tar.xz')
sha256s+=('d239e42841b7bcea1669e0389cecbe01a23a5e1249623f90101cf9ff5861086f')
urls+=('https://dl.bintray.com/chromebrew/chromebrew/libiconv-1.16-3-chromeos-i686.tar.xz')
sha256s+=('2000fe80a1a2c85c117c0375a8826a3e0a9c7cb5353398847d5e04154c989f19')
urls+=('https://dl.bintray.com/chromebrew/chromebrew/libidn2-2.0.5-chromeos-i686.tar.xz')
sha256s+=('d07969ea21a9f390afe961dcbb78f014c17cfd5bc3af6dbb4732e32004f61e6a')
urls+=('https://dl.bintray.com/chromebrew/chromebrew/libmbedtls-2.16.8-chromeos-i686.tar.xz')
......@@ -186,8 +186,8 @@ case "${ARCH}" in
sha256s+=('6587740ad61b5d0a74973235d6e6c01a4e6ea1f5510ee8103ff6e1d2ad045b41')
urls+=('https://dl.bintray.com/chromebrew/chromebrew/libcyrussasl-2.1.27-1-chromeos-x86_64.tar.xz')
sha256s+=('46241ea5cf5e0181649e91edb183128669d5ab5bc13a938493ba1158a5189743')
urls+=('https://dl.bintray.com/chromebrew/chromebrew/libiconv-1.16-2-chromeos-x86_64.tar.xz')
sha256s+=('6a344f234625a49d73b0ed8d3e3633c41186c78390ea1342081ded649fcc8dea')
urls+=('https://dl.bintray.com/chromebrew/chromebrew/libiconv-1.16-3-chromeos-x86_64.tar.xz')
sha256s+=('52e602f63df955c451b36ff0b204331ed5c336d384f6484b2f7d5ef7a43f2a6d')
urls+=('https://dl.bintray.com/chromebrew/chromebrew/libidn2-2.0.5-chromeos-x86_64.tar.xz')
sha256s+=('22b43990ca6ae415b9b7e206ed7d7b05df29b97411de55f33f11e834cf3b345c')
urls+=('https://dl.bintray.com/chromebrew/chromebrew/libmbedtls-2.16.8-chromeos-x86_64.tar.xz')
......
packages/libiconv.rb
View file @ d26b9c9a
......@@ -3,22 +3,22 @@ require 'package'
class Libiconv < Package
description 'GNU charset conversion library for libc which does not implement it.'
homepage 'https://www.gnu.org/software/libiconv/'
version '1.16-2'
version '1.16-3'
compatibility 'all'
source_url 'https://ftpmirror.gnu.org/libiconv/libiconv-1.16.tar.gz'
source_sha256 'e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04'
binary_url ({
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libiconv-1.16-2-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libiconv-1.16-2-chromeos-armv7l.tar.xz',
i686: 'https://dl.bintray.com/chromebrew/chromebrew/libiconv-1.16-2-chromeos-i686.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libiconv-1.16-2-chromeos-x86_64.tar.xz',
aarch64: 'https://dl.bintray.com/chromebrew/chromebrew/libiconv-1.16-3-chromeos-armv7l.tar.xz',
armv7l: 'https://dl.bintray.com/chromebrew/chromebrew/libiconv-1.16-3-chromeos-armv7l.tar.xz',
i686: 'https://dl.bintray.com/chromebrew/chromebrew/libiconv-1.16-3-chromeos-i686.tar.xz',
x86_64: 'https://dl.bintray.com/chromebrew/chromebrew/libiconv-1.16-3-chromeos-x86_64.tar.xz',
})
binary_sha256 ({
aarch64: '83ebdeb7420ca8b5b52cb92b0367d708dc1bbcdf08acc6044004b474b2b7e606',
armv7l: '83ebdeb7420ca8b5b52cb92b0367d708dc1bbcdf08acc6044004b474b2b7e606',
i686: 'd239e42841b7bcea1669e0389cecbe01a23a5e1249623f90101cf9ff5861086f',
x86_64: '6a344f234625a49d73b0ed8d3e3633c41186c78390ea1342081ded649fcc8dea',
aarch64: '653edc555a8a094bcee3bbd3ee8b4a88200c4f4e285df132bdaff4e3af6088cb',
armv7l: '653edc555a8a094bcee3bbd3ee8b4a88200c4f4e285df132bdaff4e3af6088cb',
i686: '2000fe80a1a2c85c117c0375a8826a3e0a9c7cb5353398847d5e04154c989f19',
x86_64: '52e602f63df955c451b36ff0b204331ed5c336d384f6484b2f7d5ef7a43f2a6d',
})
def self.build
......@@ -28,5 +28,7 @@ class Libiconv < Package
def self.install
system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
# Remove iconv.h which conflicts with same file from glibc
FileUtils.rm "#{CREW_DEST_PREFIX}/include/iconv.h"
end
end
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7