haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

nss: fix build for x86

Browse Source
This commit is contained in:
Gerasim Troeglazov
2018-08-15 11:14:52 +10:00
parent e44bd49983
commit 1b51bceeef
2 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev-libs/nss/nss-3.38.recipe
View File

@@ -11,7 +11,7 @@ LICENSE="
GNU LGPL v2.1
MPL v2.0
"
REVISION="2"
REVISION="3"
NSS_VERSION=`echo $portVersion | sed 's/\./_/g'`
SOURCE_URI="https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${NSS_VERSION}_RTM/src/nss-$portVersion.tar.gz"
CHECKSUM_SHA256="2c643d3c08d6935f4d325f40743719b6990aa25a79ec2f8f712c99d086672f62"

52
dev-libs/nss/patches/nss-3.38.patchset
View File

@@ -1,4 +1,4 @@
From 39be17d43f0617c1be3ebedea0de66274198a97f Mon Sep 17 00:00:00 2001
From 2aa45a2c3b2355964078592f252bba2342f1753f Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Sat, 5 Jul 2014 02:12:23 +0200
Subject: Haiku support
@@ -62,7 +62,7 @@ index 0a4f6dc..09a6061 100644
2.16.4
From 20cf03ba85446af467412cb0deac7cb0f6a9105f Mon Sep 17 00:00:00 2001
From 798fee81e524f85cc1e23d4dfb06f6f13533bfa0 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 25 Sep 2014 13:09:35 +0000
Subject: define RTLD_NOLOAD
@@ -87,7 +87,7 @@ index c42f694..edee40a 100644
2.16.4
From dd52aec0fb65d7d3b5589ea3ceba11ae2621fea6 Mon Sep 17 00:00:00 2001
From 19f3c7996f3db98f4c509720b5676f80a8af556e Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 25 Sep 2014 13:40:13 +0000
Subject: skip optionally the signing part
@@ -119,7 +119,7 @@ index b53cfea..51fe162 100644
2.16.4
From c86a94c9bd7fd517ee8a6a6a60e49c6816bbfd20 Mon Sep 17 00:00:00 2001
From 38e58c10c25b364718c07f366994ab45b46b49a8 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 25 Sep 2014 14:14:26 +0000
Subject: use system libs
@@ -140,7 +140,7 @@ index 51fe162..fe54580 100644
2.16.4
From d435fa2da7e973dcebce3ccfc583eeef13b3724a Mon Sep 17 00:00:00 2001
From 32a3408ba89edfa790921ba44b7134b98e5a5104 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 24 Nov 2015 19:12:08 +0000
Subject: avoid some tests.
@@ -159,7 +159,7 @@ index fe54580..3bc0ce3 100644
2.16.4
From 0199b7c66768cdacd57776478e6578bdb051d47a Mon Sep 17 00:00:00 2001
From 18f1448d42e9c2fa5e72f45bb06ce4833e17daa9 Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Fri, 27 Apr 2018 21:38:56 +0200
Subject: Enable -Bsymbolic for BeOS target
@@ -183,7 +183,7 @@ index bff11c7..0c4272f 100644
2.16.4
From ea85a23696880f54ed12e5a56b19df790565213a Mon Sep 17 00:00:00 2001
From fe86fbc25c46015bb63c6f92ede9c002a3a9cbb2 Mon Sep 17 00:00:00 2001
From: Kacper Kasper <kacperkasper@gmail.com>
Date: Sat, 11 Aug 2018 00:46:36 +0200
Subject: Define XP_HAIKU
@@ -207,7 +207,7 @@ index 3bc0ce3..d25df28 100644
2.16.4
From 73a6d03d4784d65dfbca538d3fc00017c69491e1 Mon Sep 17 00:00:00 2001
From 92156286b7b584f7be1deed33605a56f5039bdf0 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 14 Aug 2018 09:00:06 +1000
Subject: Fix build for x64
@@ -231,3 +231,39 @@ index d25df28..9cc8afc 100644
--
2.16.4
From 8e7856e475659ff8d5ccada94fff9ea8ec4ad703 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 15 Aug 2018 11:12:46 +1000
Subject: Fix build for x86
diff --git a/cmd/httpserv/httpserv.c b/cmd/httpserv/httpserv.c
index 71e2ab8..d138b1f 100644
--- a/cmd/httpserv/httpserv.c
+++ b/cmd/httpserv/httpserv.c
@@ -1325,7 +1325,7 @@ main(int argc, char **argv)
FILE *tmpfile = fopen(pidFile, "w+");
if (tmpfile) {
- fprintf(tmpfile, "%d", getpid());
+ fprintf(tmpfile, "%d", (int)getpid());
fclose(tmpfile);
}
}
diff --git a/cmd/selfserv/selfserv.c b/cmd/selfserv/selfserv.c
index c372ec9..87d2241 100644
--- a/cmd/selfserv/selfserv.c
+++ b/cmd/selfserv/selfserv.c
@@ -2519,7 +2519,7 @@ main(int argc, char **argv)
FILE *tmpfile = fopen(pidFile, "w+");
if (tmpfile) {
- fprintf(tmpfile, "%d", getpid());
+ fprintf(tmpfile, "%d", (int)getpid());
fclose(tmpfile);
}
}
--
2.16.4