Bug#135162: b-f build process somehow wrong.
Package: boot-floppies
Boot-floppies build process has some problems.
I have tried to address some.
It still stops with "whiptail" being linked to slang1,
and other things.
I think it's progressing well, but please
inspect the patch
I don't really know in detail the
build process of boot-floppies, and it could be a local
configuration error.
Index: Makefile
===================================================================
RCS file: /home/dancer/debian-boot/localcvs/boot-floppies-dancer/Makefile,v
retrieving revision 1.1.1.4
diff -u -r1.1.1.4 Makefile
--- Makefile 2002/02/22 07:03:19 1.1.1.4
+++ Makefile 2002/02/22 09:07:36
@@ -55,7 +55,7 @@
[ -d updates ] || mkdir -p updates
build:: localfiles
- $(MAKE) utils
+ #$(MAKE) utils
ifeq ($(architecture), i386)
$(MAKE) resc1440.bin resc1440-s.bin
$(MAKE) resc1440compact.bin
@@ -290,7 +290,7 @@
include make/rescue
include make/drivers
include make/tftp
-include make/utils
+#include make/utils
##
## optional file with special rules for this architecture
Index: config
===================================================================
RCS file: /home/dancer/debian-boot/localcvs/boot-floppies-dancer/make/checks,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 checks
--- make/checks 2001/12/20 03:59:16 1.1.1.2
+++ make/checks 2002/02/22 09:07:36
@@ -81,7 +81,7 @@
@echo "checking for i18n packages which will mess up non-i18n build"
@perl -e \
'%M = ("libnewt-utf8-0"=>1, "libnewt-utf8-pic"=>1, \
- "slang1-utf8"=>1, "slang1-utf8-pic"=>1); \
+ "slang1a-utf8"=>1, "slang1-utf8-pic"=>1); \
$$/ = "\n\n"; \
@Q = (); \
while (<>) { \
Index: make/i18n
===================================================================
RCS file: /home/dancer/debian-boot/localcvs/boot-floppies-dancer/make/i18n,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 i18n
--- make/i18n 2001/12/20 03:59:16 1.1.1.2
+++ make/i18n 2002/02/22 09:07:36
@@ -2,7 +2,7 @@
## packages we need for i18n, used by 'make check'
##
ifeq ($(USE_LANGUAGE_CHOOSER), true)
-depends_checks += libpng2-dev slang1-utf8 slang1-utf8-pic \
+depends_checks += libpng2-dev slang1a-utf8 slang1-utf8-pic \
libnewt-utf8-0 \
bogl-bterm libbogl-dev locales
# i386 i18n is wierd in that we is it mixed i18n and non-i18n, thus
Index: make/root
===================================================================
RCS file: /home/dancer/debian-boot/localcvs/boot-floppies-dancer/make/root,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 root
--- make/root 2001/12/10 06:29:19 1.1.1.1
+++ make/root 2002/02/22 09:07:36
@@ -19,9 +19,9 @@
# language dependancy
ifeq ($(USE_LANGUAGE_CHOOSER),true)
rootlinguadep = utilities/dbootstrap/po/all-utf utilities/dbootstrap/dbootstrap-lc utilities/dbootstrap/po/C.trm
-ifeq ($(architecture),i386)
-rootlinguadep += utilities/dbootstrap/po/$(LINGUA).trm utilities/dbootstrap/dbootstrap
-endif
+#ifeq ($(architecture),i386)
+#rootlinguadep += utilities/dbootstrap/po/$(LINGUA).trm utilities/dbootstrap/dbootstrap
+#endif
else
rootlinguadep = utilities/dbootstrap/po/$(LINGUA).trm utilities/dbootstrap/dbootstrap
endif
Index: scripts/rootdisk/EXTRACT_LIST_i18n
===================================================================
RCS file: /home/dancer/debian-boot/localcvs/boot-floppies-dancer/scripts/rootdisk/EXTRACT_LIST_i18n,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 EXTRACT_LIST_i18n
--- scripts/rootdisk/EXTRACT_LIST_i18n 2001/12/20 03:59:28 1.1.1.3
+++ scripts/rootdisk/EXTRACT_LIST_i18n 2002/02/22 09:07:37
@@ -1,3 +1,3 @@
bogl-bterm 0.1.8-1
libnewt-utf8-0 0.50.17-9
-slang1-utf8
+slang1a-utf8
Index: scripts/rootdisk/EXTRACT_LIST_i386_non-i18n-mixed-build
===================================================================
RCS file: /home/dancer/debian-boot/localcvs/boot-floppies-dancer/scripts/rootdisk/EXTRACT_LIST_i386_non-i18n-mixed-build,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 EXTRACT_LIST_i386_non-i18n-mixed-build
--- scripts/rootdisk/EXTRACT_LIST_i386_non-i18n-mixed-build 2001/12/20 03:59:29 1.1.1.1
+++ scripts/rootdisk/EXTRACT_LIST_i386_non-i18n-mixed-build 2002/02/22 09:07:37
@@ -1,2 +1,2 @@
libnewt-utf8-0 0.50.17-9
-slang1-utf8
+slang1a-utf8
Index: utilities/Makefile
===================================================================
RCS file: /home/dancer/debian-boot/localcvs/boot-floppies-dancer/utilities/Makefile,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 Makefile
--- utilities/Makefile 2001/12/20 03:59:31 1.1.1.2
+++ utilities/Makefile 2002/02/22 09:07:37
@@ -12,9 +12,12 @@
SUBDIRS := libfdisk dbootstrap writemaps
+
ifeq ($(USE_LANGUAGE_CHOOSER),true)
# bogl enabled
SUBDIRS += bogl
+# dbootstrap needs this
+export LC=true
endif
SPLIT_OBJECTS := floppy_split.o
Index: utilities/dbootstrap/Makefile
===================================================================
RCS file: /home/dancer/debian-boot/localcvs/boot-floppies-dancer/utilities/dbootstrap/Makefile,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 Makefile
--- utilities/dbootstrap/Makefile 2002/02/22 07:05:14 1.1.1.3
+++ utilities/dbootstrap/Makefile 2002/02/22 09:07:37
@@ -68,7 +68,7 @@
endif
ifeq ($(LC),true)
-CFLAGS += -DUSE_LANGUAGE_CHOOSER -DUSE_LANGUAGE_VARIANTS
+CFLAGS += -DUSE_LANGUAGE_CHOOSER -DUSE_LANGUAGE_VARIANTS -DUTF8
endif
ifdef KBD
Index: utilities/dbootstrap/langs/Makefile
===================================================================
RCS file: /home/dancer/debian-boot/localcvs/boot-floppies-dancer/utilities/dbootstrap/langs/Makefile,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 Makefile
--- utilities/dbootstrap/langs/Makefile 2002/01/07 01:04:03 1.1.1.3
+++ utilities/dbootstrap/langs/Makefile 2002/02/22 09:07:37
@@ -17,6 +17,11 @@
LIBS = -lnewt -lslang
+
+ifeq ($(LC),true)
+CFLAGS+= -DUTF8
+endif
+
ifeq ($(HAVE_UTF_CONSOLE),true)
CFLAGS += -DHAVE_UTF_CONSOLE
LANG_GEN_FLAG = 1
--
dancer@debian.org http://www.netfort.gr.jp/~dancer
Reply to: