ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-19 21:57:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Noux: fix build process of more 'e2fsprogs' programs

Browse Source 
Fixes #1065.
This commit is contained in:
Christian Prochaska 2014-02-14 17:08:42 +01:00 committed by Norman Feske
parent 53c4aa6d22
commit 21f031371f
5 changed files with 216 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/ports/e2fsprogs.mk
View File

@ -18,6 +18,6 @@ prepare:: $(CONTRIB_DIR)/$(E2FSPROGS)
$(CONTRIB_DIR)/$(E2FSPROGS):
$(VERBOSE)git clone $(E2FSPROGS_URL) $(CONTRIB_DIR)/$(E2FSPROGS) && \
cd $(CONTRIB_DIR)/$(E2FSPROGS) && \
git checkout $(E2FSPROGS_BRANCH)
git checkout -b $(E2FSPROGS_BRANCH) $(E2FSPROGS_BRANCH)
$(VERBOSE)for i in src/noux-pkg/e2fsprogs/patches/*.patch; do \
patch -N -p0 < $$i; done || true
patch -d $(CONTRIB_DIR)/$(E2FSPROGS) -N -p1 < $$i; done || true

8
ports/src/noux-pkg/e2fsprogs/patches/MCONFIG.in.patch
View File

@ -1,6 +1,8 @@
--- contrib/e2fsprogs-v1.42.9/MCONFIG.in.orig 2014-01-07 12:04:39.022395752 +0100
+++ contrib/e2fsprogs-v1.42.9/MCONFIG.in 2014-01-07 12:08:02.010390431 +0100
@@ -62,6 +62,8 @@
diff --git a/MCONFIG.in b/MCONFIG.in
index 557b37a..bcdbfa7 100644
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -62,6 +62,8 @@ datadir = @datadir@
@ifGNUmake@ endif
@ifGNUmake@ endif

255
ports/src/noux-pkg/e2fsprogs/patches/Makefile.in.patch
View File

@ -1,61 +1,8 @@
--- contrib/e2fsprogs-v1.42.9/misc/Makefile.in.orig 2014-01-07 15:22:06.554085193 +0100
+++ contrib/e2fsprogs-v1.42.9/misc/Makefile.in 2014-01-07 14:13:32.026193047 +0100
@@ -84,7 +84,7 @@
$(srcdir)/ismounted.c $(srcdir)/../e2fsck/profile.c \
$(srcdir)/e2undo.c $(srcdir)/e2freefrag.c
-LIBS= $(LIBEXT2FS) $(LIBCOM_ERR)
+LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) @LIBS@
DEPLIBS= $(LIBEXT2FS) $(DEPLIBCOM_ERR)
PROFILED_LIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR)
PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(DEPPROFILED_LIBCOM_ERR)
--- contrib/e2fsprogs-v1.42.9/ext2ed/Makefile.in.orig 2014-01-07 15:24:29.566081444 +0100
+++ contrib/e2fsprogs-v1.42.9/ext2ed/Makefile.in 2014-01-07 14:13:58.522192352 +0100
@@ -16,7 +16,7 @@
DOC_DIR = $datadir/doc/ext2ed
-LIBS = -lncurses $(LIBEXT2FS)
+LIBS = -lncurses $(LIBEXT2FS) @LIBS@
SRCS= $(srcdir)/main.c $(srcdir)/init.c $(srcdir)/general_com.c \
$(srcdir)/inode_com.c $(srcdir)/dir_com.c $(srcdir)/super_com.c \
--- contrib/e2fsprogs-v1.42.9/intl/Makefile.in.orig 2014-01-07 15:25:01.830080600 +0100
+++ contrib/e2fsprogs-v1.42.9/intl/Makefile.in 2014-01-07 12:29:48.842356174 +0100
@@ -191,7 +191,7 @@
.c.o:
$(E) " CC $<"
$(Q) $(COMPILE) $<
- $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
+ #$(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
.y.c:
$(YACC) $(YFLAGS) --output $@ $<
--- contrib/e2fsprogs-v1.42.9/e2fsck/Makefile.in.orig 2014-01-07 15:26:48.000000000 +0100
+++ contrib/e2fsprogs-v1.42.9/e2fsck/Makefile.in 2014-01-07 14:14:31.250191497 +0100
@@ -16,7 +16,7 @@
FMANPAGES= e2fsck.conf.5
LIBS= $(LIBQUOTA) $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID) \
- $(LIBINTL) $(LIBE2P)
+ $(LIBINTL) $(LIBE2P) @LIBS@
DEPLIBS= $(DEPLIBQUOTA) $(LIBEXT2FS) $(DEPLIBCOM_ERR) $(DEPLIBBLKID) \
$(DEPLIBUUID) $(DEPLIBE2P)
--- contrib/e2fsprogs-v1.42.9/resize/Makefile.in.orig 2014-01-07 15:27:41.000000000 +0100
+++ contrib/e2fsprogs-v1.42.9/resize/Makefile.in 2014-01-07 14:14:39.522191277 +0100
@@ -28,7 +28,7 @@
$(srcdir)/resource_track.c \
$(srcdir)/sim_progress.c
-LIBS= $(LIBE2P) $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBINTL)
+LIBS= $(LIBE2P) $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBINTL) @LIBS@
DEPLIBS= $(LIBE2P) $(LIBEXT2FS) $(DEPLIBCOM_ERR)
STATIC_LIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) \
--- contrib/e2fsprogs-v1.42.9/debugfs/Makefile.in.orig 2014-01-07 15:28:14.000000000 +0100
+++ contrib/e2fsprogs-v1.42.9/debugfs/Makefile.in 2014-01-07 14:14:47.890191058 +0100
@@ -31,7 +31,7 @@
diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in
index bf037e0..f9d71fa 100644
--- a/debugfs/Makefile.in
+++ b/debugfs/Makefile.in
@@ -31,7 +31,7 @@ SRCS= debug_cmds.c $(srcdir)/debugfs.c $(srcdir)/util.c $(srcdir)/ls.c \
$(srcdir)/filefrag.c $(srcdir)/extent_inode.c $(srcdir)/zap.c
LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(LIBBLKID) \
@ -64,3 +11,195 @@
DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(DEPLIBSS) $(DEPLIBCOM_ERR) \
$(DEPLIBBLKID) $(DEPLIBUUID)
diff --git a/e2fsck/Makefile.in b/e2fsck/Makefile.in
index 8e1c891..4073cf8 100644
--- a/e2fsck/Makefile.in
+++ b/e2fsck/Makefile.in
@@ -16,7 +16,7 @@ MANPAGES= e2fsck.8
FMANPAGES= e2fsck.conf.5
LIBS= $(LIBQUOTA) $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(LIBUUID) \
- $(LIBINTL) $(LIBE2P)
+ $(LIBINTL) $(LIBE2P) @LIBS@
DEPLIBS= $(DEPLIBQUOTA) $(LIBEXT2FS) $(DEPLIBCOM_ERR) $(DEPLIBBLKID) \
$(DEPLIBUUID) $(DEPLIBE2P)
diff --git a/ext2ed/Makefile.in b/ext2ed/Makefile.in
index 290f06e..584f6a5 100644
--- a/ext2ed/Makefile.in
+++ b/ext2ed/Makefile.in
@@ -16,7 +16,7 @@ MANPAGES= ext2ed.8
DOC_DIR = $datadir/doc/ext2ed
-LIBS = -lncurses $(LIBEXT2FS)
+LIBS = -lncurses $(LIBEXT2FS) @LIBS@
SRCS= $(srcdir)/main.c $(srcdir)/init.c $(srcdir)/general_com.c \
$(srcdir)/inode_com.c $(srcdir)/dir_com.c $(srcdir)/super_com.c \
diff --git a/intl/Makefile.in b/intl/Makefile.in
index bf24f63..3754ada 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -191,7 +191,7 @@ LTV_AGE=4
.c.o:
$(E) " CC $<"
$(Q) $(COMPILE) $<
- $(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
+ #$(Q) $(CHECK_CMD) $(ALL_CFLAGS) $<
.y.c:
$(YACC) $(YFLAGS) --output $@ $<
diff --git a/lib/blkid/Makefile.in b/lib/blkid/Makefile.in
index 3f15c67..4623413 100644
--- a/lib/blkid/Makefile.in
+++ b/lib/blkid/Makefile.in
@@ -127,7 +127,7 @@ tst_types: tst_types.o blkid_types.h
blkid: ../../misc/blkid.o libblkid.a $(DEPLIBUUID)
$(E) " LD $@"
- $(Q) $(CC) -o blkid ../../misc/blkid.o libblkid.a $(LIBUUID)
+ $(Q) $(CC) -o blkid ../../misc/blkid.o libblkid.a $(LIBUUID) @LIBS@
test_probe: test_probe.in Makefile
$(E) "Creating test_probe..."
diff --git a/lib/uuid/Makefile.in b/lib/uuid/Makefile.in
index 14d08c1..4aaf40d 100644
--- a/lib/uuid/Makefile.in
+++ b/lib/uuid/Makefile.in
@@ -83,12 +83,12 @@ tst_uuid.o: $(srcdir)/tst_uuid.c uuid.h
tst_uuid: tst_uuid.o $(DEPSTATIC_LIBUUID)
$(E) " LD $@"
- $(Q) $(CC) $(ALL_LDFLAGS) -o tst_uuid tst_uuid.o $(STATIC_LIBUUID)
+ $(Q) $(CC) $(ALL_LDFLAGS) -o tst_uuid tst_uuid.o $(STATIC_LIBUUID) @LIBS@
uuid_time: $(srcdir)/uuid_time.c $(DEPLIBUUID)
$(E) " LD $@"
$(Q) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -DDEBUG -o uuid_time \
- $(srcdir)/uuid_time.c $(LIBUUID)
+ $(srcdir)/uuid_time.c $(LIBUUID) @LIBS@
uuid.3: $(DEP_SUBSTITUTE) $(srcdir)/uuid.3.in
$(E) " SUBST $@"
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 553c361..819e301 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -84,7 +84,7 @@ SRCS= $(srcdir)/tune2fs.c $(srcdir)/mklost+found.c $(srcdir)/mke2fs.c \
$(srcdir)/ismounted.c $(srcdir)/../e2fsck/profile.c \
$(srcdir)/e2undo.c $(srcdir)/e2freefrag.c
-LIBS= $(LIBEXT2FS) $(LIBCOM_ERR)
+LIBS= $(LIBEXT2FS) $(LIBCOM_ERR) @LIBS@
DEPLIBS= $(LIBEXT2FS) $(DEPLIBCOM_ERR)
PROFILED_LIBS= $(PROFILED_LIBEXT2FS) $(PROFILED_LIBCOM_ERR)
PROFILED_DEPLIBS= $(PROFILED_LIBEXT2FS) $(DEPPROFILED_LIBCOM_ERR)
@@ -178,7 +178,7 @@ tune2fs.profiled: $(TUNE2FS_OBJS) $(PROFILED_DEPLIBS) \
blkid: $(BLKID_OBJS) $(DEPLIBBLKID) $(LIBEXT2FS)
$(E) " LD $@"
$(Q) $(CC) $(ALL_LDFLAGS) -o blkid $(BLKID_OBJS) $(LIBBLKID) $(LIBINTL) \
- $(LIBEXT2FS)
+ $(LIBEXT2FS) @LIBS@
blkid.static: $(BLKID_OBJS) $(STATIC_DEPLIBS) $(DEPSTATIC_LIBBLKID)
$(E) " LD $@"
@@ -229,7 +229,7 @@ check:: base_device
mklost+found: $(MKLPF_OBJS)
$(E) " LD $@"
- $(Q) $(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL)
+ $(Q) $(CC) $(ALL_LDFLAGS) -o mklost+found $(MKLPF_OBJS) $(LIBINTL) @LIBS@
mke2fs: $(MKE2FS_OBJS) $(DEPLIBS) $(LIBE2P) $(DEPLIBBLKID) $(DEPLIBUUID) \
$(DEPLIBQUOTA) $(LIBEXT2FS)
@@ -255,15 +255,15 @@ mke2fs.profiled: $(MKE2FS_OBJS) $(PROFILED_DEPLIBS) \
chattr: $(CHATTR_OBJS) $(DEPLIBS_E2P)
$(E) " LD $@"
- $(Q) $(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
+ $(Q) $(CC) $(ALL_LDFLAGS) -o chattr $(CHATTR_OBJS) $(LIBS_E2P) $(LIBINTL) @LIBS@
lsattr: $(LSATTR_OBJS) $(DEPLIBS_E2P)
$(E) " LD $@"
- $(Q) $(CC) $(ALL_LDFLAGS) -o lsattr $(LSATTR_OBJS) $(LIBS_E2P) $(LIBINTL)
+ $(Q) $(CC) $(ALL_LDFLAGS) -o lsattr $(LSATTR_OBJS) $(LIBS_E2P) $(LIBINTL) @LIBS@
uuidgen: $(UUIDGEN_OBJS) $(DEPLIBUUID)
$(E) " LD $@"
- $(Q) $(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) $(LIBINTL)
+ $(Q) $(CC) $(ALL_LDFLAGS) -o uuidgen $(UUIDGEN_OBJS) $(LIBUUID) $(LIBINTL) @LIBS@
uuidgen.profiled: $(UUIDGEN_OBJS) $(PROFILED_DEPLIBUUID)
$(E) " LD $@"
@@ -272,7 +272,7 @@ uuidgen.profiled: $(UUIDGEN_OBJS) $(PROFILED_DEPLIBUUID)
uuidd: $(UUIDD_OBJS) $(DEPLIBUUID)
$(E) " LD $@"
- $(Q) $(CC) $(ALL_LDFLAGS) -o uuidd $(UUIDD_OBJS) $(LIBUUID) $(LIBINTL)
+ $(Q) $(CC) $(ALL_LDFLAGS) -o uuidd $(UUIDD_OBJS) $(LIBUUID) $(LIBINTL) @LIBS@
uuidd.profiled: $(UUIDD_OBJS) $(PROFILED_DEPLIBUUID)
$(E) " LD $@"
@@ -293,7 +293,7 @@ dumpe2fs.profiled: $(DUMPE2FS_OBJS) $(PROFILED_DEPLIBS) \
fsck: $(FSCK_OBJS) $(DEPLIBBLKID)
$(E) " LD $@"
- $(Q) $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBINTL)
+ $(Q) $(CC) $(ALL_LDFLAGS) -o fsck $(FSCK_OBJS) $(LIBBLKID) $(LIBINTL) @LIBS@
fsck.profiled: $(FSCK_OBJS) $(PROFILED_DEPLIBBLKID)
$(E) " LD $@"
@@ -311,7 +311,7 @@ badblocks.profiled: $(BADBLOCKS_OBJS) $(PROFILED_DEPLIBS)
logsave: logsave.o
$(E) " LD $@"
- $(Q) $(CC) $(ALL_LDFLAGS) -o logsave logsave.o
+ $(Q) $(CC) $(ALL_LDFLAGS) -o logsave logsave.o @LIBS@
logsave.profiled: logsave.o
$(E) " LD $@"
@@ -328,7 +328,7 @@ e2freefrag.profiled: $(E2FREEFRAG_OBJS) $(PROFILED_DEPLIBS)
filefrag: $(FILEFRAG_OBJS)
$(E) " LD $@"
- $(Q) $(CC) $(ALL_LDFLAGS) -o filefrag $(FILEFRAG_OBJS)
+ $(Q) $(CC) $(ALL_LDFLAGS) -o filefrag $(FILEFRAG_OBJS) @LIBS@
filefrag.profiled: $(FILEFRAG_OBJS)
$(E) " LD $@"
diff --git a/resize/Makefile.in b/resize/Makefile.in
index b8fb3ae..2850999 100644
--- a/resize/Makefile.in
+++ b/resize/Makefile.in
@@ -28,7 +28,7 @@ SRCS= $(srcdir)/extent.c \
$(srcdir)/resource_track.c \
$(srcdir)/sim_progress.c
-LIBS= $(LIBE2P) $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBINTL)
+LIBS= $(LIBE2P) $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBINTL) @LIBS@
DEPLIBS= $(LIBE2P) $(LIBEXT2FS) $(DEPLIBCOM_ERR)
STATIC_LIBS= $(STATIC_LIBE2P) $(STATIC_LIBEXT2FS) $(STATIC_LIBCOM_ERR) \
diff --git a/tests/progs/Makefile.in b/tests/progs/Makefile.in
index 37abf23..3aba8e0 100644
--- a/tests/progs/Makefile.in
+++ b/tests/progs/Makefile.in
@@ -37,7 +37,7 @@ test_rel: $(TEST_REL_OBJS) $(DEPLIBS)
crcsum: crcsum.o $(DEPLIBS)
$(E) " LD $@"
- $(Q) $(LD) $(ALL_LDFLAGS) -o crcsum crcsum.o $(LIBS)
+ $(Q) $(LD) $(ALL_LDFLAGS) -o crcsum crcsum.o $(LIBS) @LIBS@
test_rel_cmds.c: test_rel_cmds.ct
$(E) " MK_CMDS $@"
@@ -45,7 +45,7 @@ test_rel_cmds.c: test_rel_cmds.ct
test_icount: $(TEST_ICOUNT_OBJS) $(DEPLIBS)
$(E) " LD $@"
- $(Q) $(LD) $(ALL_LDFLAGS) -o test_icount $(TEST_ICOUNT_OBJS) $(LIBS)
+ $(Q) $(LD) $(ALL_LDFLAGS) -o test_icount $(TEST_ICOUNT_OBJS) $(LIBS) @LIBS@
test_icount_cmds.c: test_icount_cmds.ct
$(E) " MK_CMDS $@"

8
ports/src/noux-pkg/e2fsprogs/patches/Makefile.library.patch
View File

@ -1,6 +1,8 @@
--- contrib/e2fsprogs-v1.42.9/lib/Makefile.library.orig 2014-01-07 12:22:50.526367140 +0100
+++ contrib/e2fsprogs-v1.42.9/lib/Makefile.library 2014-01-07 12:24:59.142363769 +0100
@@ -2,6 +2,8 @@
diff --git a/lib/Makefile.library b/lib/Makefile.library
index 1b86b02..264246a 100644
--- a/lib/Makefile.library
+++ b/lib/Makefile.library
@@ -2,6 +2,8 @@ all:: subdirs $(LIBRARY).a
install-shlibs::

12
ports/src/noux-pkg/e2fsprogs/patches/configure.patch
View File

@ -1,6 +1,8 @@
--- contrib/e2fsprogs-v1.42.9/configure.orig 2014-01-07 14:59:39.000000000 +0100
+++ contrib/e2fsprogs-v1.42.9/configure 2014-01-07 15:59:14.598026789 +0100
@@ -4225,10 +4225,10 @@
diff --git a/configure b/configure
index 31ec8d3..1026463 100755
--- a/configure
+++ b/configure
@@ -4225,10 +4225,10 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@ -15,7 +17,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5526,6 +5526,9 @@
@@ -5526,6 +5526,9 @@ fi
fi
@ -25,7 +27,7 @@
if test "$try_tls" = "yes"
then
@@ -11349,7 +11352,9 @@
@@ -11349,7 +11352,9 @@ if test "$sysconfdir" != '${prefix}/etc'; then
$as_echo "Setting root_sysconfdir to $root_sysconfdir" >&6; }
fi