Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
make
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
certo
make
Commits
fb1167d3
Commit
fb1167d3
authored
Aug 03, 2021
by
Vladimir Bashkirtsev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed included makefile issue
parent
762a7038
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
47 additions
and
0 deletions
+47
-0
Makefile
Makefile
+1
-0
make-4.3-fix_included_makefile.patch
make-4.3-fix_included_makefile.patch
+46
-0
No files found.
Makefile
View file @
fb1167d3
all
:
all
:
tar
xf make-4.3.tar.gz
tar
xf make-4.3.tar.gz
patch
-Np1
-d
make-4.3 < make-4.3-fix_included_makefile.patch
cd
make-4.3
&&
./configure
--build
=
$(CLFS_TARGET)
--prefix
=
/usr
cd
make-4.3
&&
./configure
--build
=
$(CLFS_TARGET)
--prefix
=
/usr
$(MAKE)
-C
make-4.3
$(MAKE)
-C
make-4.3
if
[[
!
"
$(BUILD_OPTIONS)
"
=
~ no-tests
]]
;
then
\
if
[[
!
"
$(BUILD_OPTIONS)
"
=
~ no-tests
]]
;
then
\
...
...
make-4.3-fix_included_makefile.patch
0 → 100644
View file @
fb1167d3
diff -uNr make-4.3/src/makeint.h make-4.3-fix_included_makefile/src/makeint.h
--- make-4.3/src/makeint.h 2020-01-20 07:02:59.000000000 +1030
+++ make-4.3-fix_included_makefile/src/makeint.h 2021-08-03 10:47:07.011722714 +0930
@@ -565,6 +565,7 @@
void print_dir_data_base (void);
void dir_setup_glob (glob_t *);
void hash_init_directories (void);
+FILE_TIMESTAMP name_mtime (const char *name);
void define_default_variables (void);
void undefine_default_variables (void);
diff -uNr make-4.3/src/read.c make-4.3-fix_included_makefile/src/read.c
--- make-4.3/src/read.c 2020-01-03 17:41:27.000000000 +1030
+++ make-4.3-fix_included_makefile/src/read.c 2021-08-03 10:48:13.937940161 +0930
@@ -418,6 +418,11 @@
/* Success; clear errno. */
deps->error = 0;
+ /* Managed to read the file. Update mtime, if needed.
+ https://savannah.gnu.org/bugs/?57676. */
+ if (deps->file->last_mtime == NONEXISTENT_MTIME)
+ deps->file->last_mtime = name_mtime(deps->file->name);
+
/* Avoid leaking the makefile to children. */
fd_noinherit (fileno (ebuf.fp));
diff -uNr make-4.3/src/remake.c make-4.3-fix_included_makefile/src/remake.c
--- make-4.3/src/remake.c 2020-01-03 17:41:27.000000000 +1030
+++ make-4.3-fix_included_makefile/src/remake.c 2021-08-03 10:49:36.838209515 +0930
@@ -67,7 +67,6 @@
FILE_TIMESTAMP this_mtime, int *must_make);
static enum update_status touch_file (struct file *file);
static void remake_file (struct file *file);
-static FILE_TIMESTAMP name_mtime (const char *name);
static const char *library_search (const char *lib, FILE_TIMESTAMP *mtime_ptr);
@@ -1462,7 +1461,7 @@
This causes one duplicate stat() when -L is being used, but the code is
much cleaner. */
-static FILE_TIMESTAMP
+FILE_TIMESTAMP
name_mtime (const char *name)
{
FILE_TIMESTAMP mtime;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment