system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-22 18:46:18 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Ports: Replace the libiconv config.sub patch with our download

Browse source
This commit is contained in:
Tim Schumacher 2022-05-25 13:59:31 +02:00 committed by Linus Groh
parent f31f25b918
commit ffe541e4ef
4 changed files with 4 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ports/libiconv/package.sh
View file

@ -5,6 +5,8 @@ useconfigure=true
configopts=("--enable-shared" "--disable-nls")
files="https://ftpmirror.gnu.org/gnu/libiconv/libiconv-${version}.tar.gz libiconv-${version}.tar.gz e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04"
auth_type="sha256"
use_fresh_config_sub=true
config_sub_paths=("build-aux/config.sub" "libcharset/build-aux/config.sub")
install() {
run make DESTDIR=${SERENITY_INSTALL_ROOT} "${installopts[@]}" install

2
Ports/libiconv/patches/0002-Stub-out-getprogname-for-serenity.patch → Ports/libiconv/patches/0001-Stub-out-getprogname-for-serenity.patch
View file

@ -1,7 +1,7 @@
From 9b61ddd52828042b106d7d4c3fef582be9c933e7 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Sun, 6 Oct 2019 11:11:16 +0100
Subject: [PATCH 2/2] Stub out getprogname() for serenity
Subject: [PATCH 1/1] Stub out getprogname() for serenity
---
srclib/getprogname.c | 2 ++

55
Ports/libiconv/patches/0001-Teach-config.sub-about-serenity.patch
View file

@ -1,55 +0,0 @@
From a92364ad8e2c7e870f800ffa5bcb0f385b61b823 Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Sun, 6 Oct 2019 11:11:16 +0100
Subject: [PATCH 1/2] Teach config.sub about serenity
---
build-aux/config.sub | 3 ++-
libcharset/build-aux/config.sub | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/build-aux/config.sub b/build-aux/config.sub
index a44fd8a..6b21345 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2019 Free Software Foundation, Inc.
-timestamp='2019-01-05'
+timestamp='2019-10-05'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -1341,6 +1341,7 @@ case $os in
# Each alternative MUST end in a * to match a version number.
# sysv* is not here because it comes later, after sysvr4.
gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
+ | serenity* \
| *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
| hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
| sym* | kopensolaris* | plan9* \
diff --git a/libcharset/build-aux/config.sub b/libcharset/build-aux/config.sub
index a44fd8a..6b21345 100755
--- a/libcharset/build-aux/config.sub
+++ b/libcharset/build-aux/config.sub
@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2019 Free Software Foundation, Inc.
-timestamp='2019-01-05'
+timestamp='2019-10-05'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -1341,6 +1341,7 @@ case $os in
# Each alternative MUST end in a * to match a version number.
# sysv* is not here because it comes later, after sysvr4.
gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
+ | serenity* \
| *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
| hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
| sym* | kopensolaris* | plan9* \
--
2.36.1

7
Ports/libiconv/patches/ReadMe.md
View file

@ -1,11 +1,6 @@
# Patches for libiconv on SerenityOS
## `0001-Teach-config.sub-about-serenity.patch`
Teach config.sub about serenity
## `0002-Stub-out-getprogname-for-serenity.patch`
## `0001-Stub-out-getprogname-for-serenity.patch`
Stub out getprogname() for serenity