Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
cookbook
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
redox-os
cookbook
Commits
010649b7
Verified
Commit
010649b7
authored
6 years ago
by
Jeremy Soller
Browse files
Options
Downloads
Patches
Plain Diff
Fixes for compiling make
parent
01f7b16d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
recipes/gnu-make/make.patch
+32
-8
32 additions, 8 deletions
recipes/gnu-make/make.patch
recipes/gnu-make/recipe.sh
+1
-1
1 addition, 1 deletion
recipes/gnu-make/recipe.sh
with
33 additions
and
9 deletions
recipes/gnu-make/make.patch
+
32
−
8
View file @
010649b7
diff -ru make-4.2/config/config.sub make-4.2-new/config/config.sub
--- make-4.2/config/config.sub 201
6-05-22 06:27:16.000000000
-0700
+++ make-4.2-new/config/config.sub 201
7-05-09 13:36:20.5
19
9
08
366
-0700
--- make-4.2/config/config.sub 201
8-11-16 20:15:41.363343886
-0700
+++ make-4.2-new/config/config.sub 201
8-11-16 20:15:58.0954
1908
9
-0700
@@ -1376,7 +1376,7 @@
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
...
...
@@ -10,9 +10,33 @@ diff -ru make-4.2/config/config.sub make-4.2-new/config/config.sub
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* | -cloudabi* | -sortix* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
diff -ru make-4.2/getopt1.c make-4.2-new/getopt1.c
--- make-4.2/getopt1.c 2018-11-16 20:15:41.379343966 -0700
+++ make-4.2-new/getopt1.c 2018-11-16 20:28:25.520961828 -0700
@@ -48,6 +48,8 @@
#endif
#endif
+#define ELIDE_CODE
+
#ifndef ELIDE_CODE
diff -ru make-4.2/getopt.c make-4.2-new/getopt.c
--- make-4.2/getopt.c 2018-11-16 20:15:41.359343867 -0700
+++ make-4.2-new/getopt.c 2018-11-16 20:28:07.653254603 -0700
@@ -56,6 +56,8 @@
# endif
#endif
+#define ELIDE_CODE
+
#ifndef ELIDE_CODE
diff -ru make-4.2/glob/glob.c make-4.2-new/glob/glob.c
--- make-4.2/glob/glob.c 201
3
-1
0-20 10:14:38.000000000
-0700
+++ make-4.2-new/glob/glob.c 201
7-05-09 14:14:14.319260425
-0700
--- make-4.2/glob/glob.c 201
8
-1
1-16 20:15:41.359343867
-0700
+++ make-4.2-new/glob/glob.c 201
8-11-16 20:15:58.095419089
-0700
@@ -625,9 +625,9 @@
#else
const char *home_dir = getenv ("HOME");
...
...
@@ -35,8 +59,8 @@ diff -ru make-4.2/glob/glob.c make-4.2-new/glob/glob.c
{
char *end_name = strchr (dirname, '/');
diff -ru make-4.2/job.c make-4.2-new/job.c
--- make-4.2/job.c 201
6-05-21 13:22:32.000000000
-0700
+++ make-4.2-new/job.c 201
7-05-09 13:52:47.8067
910
42
-0700
--- make-4.2/job.c 201
8-11-16 20:15:41.351343827
-0700
+++ make-4.2-new/job.c 201
8-11-16 20:15:58.09941
910
6
-0700
@@ -1038,7 +1038,7 @@
void
block_sigs (void)
...
...
@@ -59,8 +83,8 @@ diff -ru make-4.2/job.c make-4.2-new/job.c
#endif
diff -ru make-4.2/read.c make-4.2-new/read.c
--- make-4.2/read.c 201
6-05-21 13:22:32.000000000
-0700
+++ make-4.2-new/read.c 201
7-05-09 13:5
5:
0
8.
237484319
-0700
--- make-4.2/read.c 201
8-11-16 20:15:41.359343867
-0700
+++ make-4.2-new/read.c 201
8-11-16 20:1
5:
5
8.
099419106
-0700
@@ -2937,7 +2937,7 @@
free (home_dir);
home_dir = getenv ("HOME");
...
...
This diff is collapsed.
Click to expand it.
recipes/gnu-make/recipe.sh
+
1
−
1
View file @
010649b7
...
...
@@ -12,7 +12,7 @@ function recipe_update {
}
function
recipe_build
{
./configure
--host
=
${
HOST
}
--prefix
=
/
CFLAGS
=
-DPOSIX
--without-guile
./configure
--host
=
${
HOST
}
--prefix
=
/
CFLAGS
=
"
-DPOSIX
-DNO_ARCHIVES -DNO_OUTPUT_SYNC"
--without-guile
make
skip
=
1
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment