On 08/21/2012 11:36 PM, Bruce Dubbs wrote:
Armin K. wrote:
On 08/21/2012 11:15 PM, Bruce Dubbs wrote:
Armin K. wrote:
glibconfig.h is architecture dependent and it is installed in
/usr/lib/glib-2.0/include or something like that. And I believe I've set
gudev cflags to look into both dirs, right?
There's some other issues like hot having the build/ directory. I'll
investigate some more.
That's what I get for using a version of glib slightly out of date
(May). It's there now that I installed glib-2.32.4.
I see the problem. I have udev-lfs-187 tarball, and when I use it to
build gudev from 188, it builds. But when I use udev-lfs-188, gudev
fails with same error as Ken pointed out. I have to check what you've
changed.
Hmm. I have three 187 tarballs: udev-lfs-187.tar.bz2,
udev-lfs-187-2.tar.bz2, udev-lfs-187-3.tar.bz2. I don't have any
differences between makefile-incl.gudev in udev-lfs-187-3 and
udev-lfs-188.
There's obviously an error somewhere. Continuing to check.
-- Bruce
There, I've checked and verified that the patch works. Please apply it
as-is, do not modify it! You can notice that I changed things like SED,
AWK, GPERF, CCGUDEV to be like autotools ones, respectively GEN and CC
... Also, I've created "common" make target, which will create build dir
and copy cfg.h in place, also I've applied the corrections for that
where needed. And at last, it looks like VPATH was cuplrit (I don't know
what it does). I made seperate build/gudev-1.0.pc target for that and
now everything seems to work okay.
diff -Naur udev-lfs.orig/makefile-incl.gudev udev-lfs/makefile-incl.gudev
--- udev-lfs.orig/makefile-incl.gudev 2012-07-30 19:04:26.000000000 +0200
+++ udev-lfs/makefile-incl.gudev 2012-08-21 23:50:07.065145505 +0200
@@ -66,8 +66,8 @@
@echo GEN $@
$(VB)glib-mkenums --template $^ > $@
-build/%o: src/gudev/%c build cfg.h $(GUDEV_GENERATED)
- @echo CCGUDEV $<
+build/%o: src/gudev/%c $(GUDEV_GENERATED) common
+ @echo CC $<
$(VB)gcc -c $(LIBGUDEV_CFLAGS) $(WARN) $(OPTIONS) $(INCLUDE) $(DEF) -o $@ $<
build/$(LIBGUDEV_REAL_NAME): $(LIBGUDEV_OBJS) build/udev-local.a build/$(LIBUDEV_REAL_NAME)
@@ -78,9 +78,11 @@
ln -sfn $(LIBGUDEV_REAL_NAME) build/$(LIBGUDEV_LINK_NAME)
ln -sfn $(LIBGUDEV_REAL_NAME) build/$(LIBGUDEV_SONAME)
-VPATH += src/gudev
+build/gudev-1.0.pc: src/gudev/gudev-1.0.pc.in
+ @echo GEN $@
+ @$(SED_PROCESS)
-gudev: build cfg.h build/$(LIBGUDEV_REAL_NAME) build/gudev-1.0.pc
+gudev: build/$(LIBGUDEV_REAL_NAME) build/gudev-1.0.pc
clean-gudev:
rm -f src/gudev/gudevmarshal.h
@@ -101,6 +103,6 @@
@ln -svfn $(LIBGUDEV_REAL_NAME) $(DESTDIR)/usr/lib/$(LIBGUDEV_SONAME)
@ln -svfn $(LIBGUDEV_REAL_NAME) $(DESTDIR)/usr/lib/$(LIBGUDEV_LINK_NAME)
- @cp -v build/gudev-1.0.pc $(DESTDIR)/usr/lib/pkgconfig/gudev-1.0.pc
+ @cp -v build/gudev-1.0.pc $(DESTDIR)/usr/lib/pkgconfig
@cp -v docs/gudev/html/* $(DESTDIR)/usr/share/gtk-doc/html/gudev
diff -Naur udev-lfs.orig/makefile-incl.keymap udev-lfs/makefile-incl.keymap
--- udev-lfs.orig/makefile-incl.keymap 2012-08-12 19:56:17.000000000 +0200
+++ udev-lfs/makefile-incl.keymap 2012-08-21 23:45:28.620677836 +0200
@@ -1,4 +1,4 @@
-# Custom systemd Makefile include that builds/installs gir only for LFS
+# Custom systemd Makefile include that builds/installs keymap tool only for LFS
# vim: tabstop=3
@@ -70,10 +70,10 @@
keymaps-force-release/samsung-90x3a \
keymaps-force-release/common-volume-keys
-KEYMAP_DEPS = src/udev/keymap/keys-from-name.h src/udev/keymap/keys-to-name.h
+KEYMAP_DEPS = common src/udev/keymap/keys-from-name.h src/udev/keymap/keys-to-name.h
src/udev/keymap/keys.txt:
- @echo AWK $@
+ @echo GEN $@
$(VB)awk '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ \
{ \
if ($$2 != "KEY_MAX") { print $$2 } \
@@ -81,7 +81,7 @@
/usr/include/linux/input.h | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt
- @echo AWK $@
+ @echo GEN $@
$(VB)awk 'BEGIN \
{ \
print "struct key \
@@ -97,11 +97,11 @@
}' $< > $@
src/udev/keymap/keys-from-name.h: src/udev/keymap/keys-from-name.gperf
- @echo GPERF $@
+ @echo GEN $@
$(VB)gperf -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C $< > $@
src/udev/keymap/keys-to-name.h: src/udev/keymap/keys.txt
- @echo AWK $@
+ @echo GEN $@
$(VB)awk 'BEGIN \
{ \
print "const char* const key_names[KEY_CNT] = { " \
@@ -112,7 +112,7 @@
END{print "};" \
}' $< > $@
-build/keymap: cfg.h src/udev/keymap/keymap.c build/$(COMMON_LIB) $(KEYMAP_DEPS)
+build/keymap: src/udev/keymap/keymap.c build/$(COMMON_LIB) $(KEYMAP_DEPS)
@echo LINK $@
$(VB)gcc $< -o $@ -I src/udev/keymap $(WARN) $(OPTIONS2) $(INCLUDE) $(DEF) \
build/$(COMMON_LIB) $(LDFLAGS)
diff -Naur udev-lfs.orig/Makefile.lfs udev-lfs/Makefile.lfs
--- udev-lfs.orig/Makefile.lfs 2012-08-12 20:36:36.000000000 +0200
+++ udev-lfs/Makefile.lfs 2012-08-21 23:41:07.184671907 +0200
@@ -140,8 +140,7 @@
< $< > $@
-udev: cfg.h \
- build \
+udev: common \
build/$(COMMON_LIB) \
build/$(LIBUDEV_REAL_NAME) \
build/udevd \
@@ -156,10 +155,8 @@
build/udev.pc \
build/libudev.pc
-build:
+common: udev-lfs-$(VERSION)/cfg.h
@mkdir -p build
-
-cfg.h: udev-lfs-$(VERSION)/cfg.h
cp udev-lfs-$(VERSION)/cfg.h .
build/%o: %c
@@ -250,7 +247,7 @@
$(VB)strip --strip-unneeded $@
build/%pc: %pc.in
- @echo SED $<
+ @echo GEN $@
@$(SED_PROCESS)
install: udev
--
http://linuxfromscratch.org/mailman/listinfo/blfs-support
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
