Source: unicon
Version: 3.0.4+dfsg1-1
Tags: patch upstream
User: helm...@debian.org
Usertags: rebootstrap
unicon fails to cross build from source, because the upstream build
system fails to forward the detected compiler to the generated
Makefiles. For the C++ parts, ./configure doesn't even detect the
compiler yet. The attached patch fixes this aspect. Given that unicon
does not build from source, I couldn't test it though. Likely, unicon
won't cross build after applying it. Please close this bug anyhow after
resolving the compiler forwarding issue.
Helmut
--- unicon-3.0.4+dfsg1.orig/unicon/client/Makefile.in
+++ unicon-3.0.4+dfsg1/unicon/client/Makefile.in
@@ -1,3 +1,5 @@
+CC=@CC@
+CXX=@CXX@
prefix=@prefix@
CFLAGS = @CFLAGS@
CFLAGS += -I.
@@ -15,23 +17,23 @@
libimmclient.a: $(DLIB_OBJS)
ar rc $(PROG_LIB) $(DLIB_OBJS)
TLC_LibImmClient.o: TLC_LibImmClient.cpp
- gcc $(CFLAGS) -c TLC_LibImmClient.cpp -o TLC_LibImmClient.o
+ $(CC) $(CFLAGS) -c TLC_LibImmClient.cpp -o TLC_LibImmClient.o
slib: $(SLIB_OBJS)
ar rc $(PROG_LIB) $(SLIB_OBJS)
TLC_LIB_OBJS TLC_TcpipImmClient.o: TLC_TcpipImmClient.cpp
- gcc $(CFLAGS) -c TLC_TcpipImmClient.cpp -o TLC_TcpipImmClient.o
+ $(CC) $(CFLAGS) -c TLC_TcpipImmClient.cpp -o TLC_TcpipImmClient.o
TLC_ImmServer.o: TLC_ImmServer.cpp TLC_ImmServer.hpp
- gcc $(CFLAGS) -c TLC_ImmServer.cpp -o TLC_ImmServer.o
+ $(CC) $(CFLAGS) -c TLC_ImmServer.cpp -o TLC_ImmServer.o
TLC_Utils.o: TLC_Utils.cpp
- gcc $(CFLAGS) -c TLC_Utils.cpp -o TLC_Utils.o
+ $(CC) $(CFLAGS) -c TLC_Utils.cpp -o TLC_Utils.o
TLC_MemFile.o: TLC_MemFile.cpp TLC_MemFile.hpp
- gcc $(CFLAGS) -c TLC_MemFile.cpp -o TLC_MemFile.o
+ $(CC) $(CFLAGS) -c TLC_MemFile.cpp -o TLC_MemFile.o
TLC_SocketClient.o: TLC_SocketClient.cpp TLC_SocketClient.hpp
- gcc $(CFLAGS) -c TLC_SocketClient.cpp -o TLC_SocketClient.o
+ $(CC) $(CFLAGS) -c TLC_SocketClient.cpp -o TLC_SocketClient.o
test: all $(SERVER_LIB)
- g++ $(CFLAGS) -D__DLL_SUPPORT__ -ldl -lpth test.cpp $(PROG_LIB) $(SERVER_LIB) -o test
+ $(CXX) $(CFLAGS) -D__DLL_SUPPORT__ -ldl -lpth test.cpp $(PROG_LIB) $(SERVER_LIB) -o test
install: all
# mkdir -p $(prefix)/lib
--- unicon-3.0.4+dfsg1.orig/unicon/server/Makefile.in
+++ unicon-3.0.4+dfsg1/unicon/server/Makefile.in
@@ -15,7 +15,7 @@
# CFLAGS = -g -D__IMM_DEBUG__ -Wall -I. -I/usr/include -I../include
CFLAGS = -fPIC -g -Wall -I. -I../include
-CC=g++
+CC=@CXX@
all: $(DLIB_PROG)
--- unicon-3.0.4+dfsg1.orig/configure.in
+++ unicon-3.0.4+dfsg1/configure.in
@@ -8,6 +8,7 @@
dnl Checks for programs.
AC_PROG_AWK
AC_PROG_CC
+AC_PROG_CXX
AC_PROG_INSTALL
AC_PROG_MAKE_SET
--- unicon-3.0.4+dfsg1.orig/unicon/ImmModules/cce/Makefile.in
+++ unicon-3.0.4+dfsg1/unicon/ImmModules/cce/Makefile.in
@@ -1,4 +1,5 @@
# $Id$
+CC=@CC@
prefix=@prefix@
CFLAGS = @CFLAGS@
CFLAGS += -I.
@@ -11,30 +12,30 @@
all: cce_hzinput.so cce_pinyin.so gb18030_intcode.so
CCE_hzinput.o : CCE_hzinput.c
- gcc $(CFLAGS) -c CCE_hzinput.c -o CCE_hzinput.o
+ $(CC) $(CFLAGS) -c CCE_hzinput.c -o CCE_hzinput.o
xl_hzinput.o : xl_hzinput.c
- gcc $(CFLAGS) -c xl_hzinput.c -o xl_hzinput.o
+ $(CC) $(CFLAGS) -c xl_hzinput.c -o xl_hzinput.o
cce_hzinput.so: CCE_hzinput.o xl_hzinput.o
- gcc CCE_hzinput.o xl_hzinput.o -fPIC -shared -o cce_hzinput.so $(LDFLAGS)
+ $(CC) CCE_hzinput.o xl_hzinput.o -fPIC -shared -o cce_hzinput.so $(LDFLAGS)
xl_pinyin.o : xl_pinyin.c xl_pinyin.h
- gcc $(CFLAGS) -c xl_pinyin.c -o xl_pinyin.o
+ $(CC) $(CFLAGS) -c xl_pinyin.c -o xl_pinyin.o
CCE_pinyin.o : CCE_pinyin.c
- gcc $(CFLAGS) -c CCE_pinyin.c -o CCE_pinyin.o
+ $(CC) $(CFLAGS) -c CCE_pinyin.c -o CCE_pinyin.o
cce_pinyin.so : xl_pinyin.o CCE_pinyin.o
- gcc CCE_pinyin.o xl_pinyin.o -fPIC -shared -o cce_pinyin.so $(LDFLAGS)
+ $(CC) CCE_pinyin.o xl_pinyin.o -fPIC -shared -o cce_pinyin.so $(LDFLAGS)
intcode.o : xl_intcode.c
- gcc $(CFLAGS) -c xl_intcode.c -o intcode.o
+ $(CC) $(CFLAGS) -c xl_intcode.c -o intcode.o
gb18030_intcode.so : intcode.o
- gcc intcode.o -shared -o gb18030_intcode.so $(LDFLAGS)
+ $(CC) intcode.o -shared -o gb18030_intcode.so $(LDFLAGS)
test: hzinput_test intcode_test
hzinput_test: xl_hzinput.c CCE_hzinput.c hzinput_test.c
- gcc $(CFLAGS) xl_hzinput.c CCE_hzinput.c hzinput_test.c -o hzinput_test
+ $(CC) $(CFLAGS) xl_hzinput.c CCE_hzinput.c hzinput_test.c -o hzinput_test
intcode_test: xl_intcode.c intcode_test.c
- gcc $(CFLAGS) xl_intcode.c intcode_test.c -o intcode_test
+ $(CC) $(CFLAGS) xl_intcode.c intcode_test.c -o intcode_test
install: all
mkdir -p $(prefix)/lib/unicon/modules/cce
--- unicon-3.0.4+dfsg1.orig/unicon/ImmModules/turbo/Makefile.in
+++ unicon-3.0.4+dfsg1/unicon/ImmModules/turbo/Makefile.in
@@ -1,3 +1,4 @@
+CC=@CC@
prefix=@prefix@
CFLAGS=@CFLAGS@
# CFLAGS += -V2.7.2.3 -I.
@@ -11,17 +12,17 @@
dlib: $(PROG)
xl_mfile.o : xl_mfile.c xl_mfile.h
- gcc $(CFLAGS) -c xl_mfile.c -o xl_mfile.o
+ $(CC) $(CFLAGS) -c xl_mfile.c -o xl_mfile.o
TL_hzinput.o : TL_hzinput.c
- gcc $(CFLAGS) -DUNICON_LIB=\"$(prefix)/lib/unicon\" -c TL_hzinput.c -o TL_hzinput.o
+ $(CC) $(CFLAGS) -DUNICON_LIB=\"$(prefix)/lib/unicon\" -c TL_hzinput.c -o TL_hzinput.o
xl_hzinput.o : xl_hzinput.c
- gcc $(CFLAGS) -c xl_hzinput.c -o xl_hzinput.o
+ $(CC) $(CFLAGS) -c xl_hzinput.c -o xl_hzinput.o
xl_phrase.o : xl_phrase.c
- gcc $(CFLAGS) -c xl_phrase.c -o xl_phrase.o
+ $(CC) $(CFLAGS) -c xl_phrase.c -o xl_phrase.o
xl_sysphrase.o : xl_sysphrase.c
- gcc $(CFLAGS) -c xl_sysphrase.c -o xl_sysphrase.o
+ $(CC) $(CFLAGS) -c xl_sysphrase.c -o xl_sysphrase.o
$(PROG): $(TL_OBJS)
- gcc $(TL_OBJS) -fPIC -shared -o $(PROG) $(LDFLAGS)
+ $(CC) $(TL_OBJS) -fPIC -shared -o $(PROG) $(LDFLAGS)
# GB Support
gbdata: cin2tab addphrase levelphrase
@@ -51,14 +52,14 @@
./cin2tab -c xcin-25/simplex -o tl_sysphrase.big5.bin
cin2tab : cin2tab.c $(TL_OBJS)
- gcc -c -g -I../../include -I. cin2tab.c -o cin2tab.o
- gcc $(TL_OBJS) cin2tab.o -o cin2tab
+ $(CC) -c -g -I../../include -I. cin2tab.c -o cin2tab.o
+ $(CC) $(TL_OBJS) cin2tab.o -o cin2tab
addphrase : addphrase.c $(TL_OBJS)
- gcc -g -c -I. -I../../include addphrase.c -o addphrase.o
- gcc $(TL_OBJS) addphrase.o -o addphrase
+ $(CC) -g -c -I. -I../../include addphrase.c -o addphrase.o
+ $(CC) $(TL_OBJS) addphrase.o -o addphrase
levelphrase : levelphrase.c
- gcc -g -I../../include -I. levelphrase.c -o levelphrase
+ $(CC) -g -I../../include -I. levelphrase.c -o levelphrase
install: all
mkdir -p $(prefix)/lib/unicon/modules/turbo
cp -f *.so $(prefix)/lib/unicon/modules/turbo
--- unicon-3.0.4+dfsg1.orig/unicon/unicon/Makefile.in
+++ unicon-3.0.4+dfsg1/unicon/unicon/Makefile.in
@@ -9,7 +9,7 @@
# CFLAGS = -g -Wall -I. -DSIMULATE_OS_KEY -DSIMULATE_OS_VIDEO
# __CLIB24_SUPPORT__
CFLAGS = -g -Wall -I. -I../include -I../../include -I../unikey
-CC = g++ -g
+CC = @CXX@ -g
all: $(PROG) unicon.ini
unicon: $(OBJS) $(S_IMM_LIB)
--- unicon-3.0.4+dfsg1.orig/unicon/ImmModules/cxterm/Makefile.in
+++ unicon-3.0.4+dfsg1/unicon/ImmModules/cxterm/Makefile.in
@@ -1,3 +1,4 @@
+CC=@CC@
prefix=@prefix@
CFLAGS = @CFLAGS@
# CFLAGS += -V2.7.2.3 -I.
@@ -11,11 +12,11 @@
cd utils && make
cd dict && make
$(PROG) : $(OBJS)
- gcc $(OBJS) -fPIC -shared -o $(PROG)
+ $(CC) $(OBJS) -fPIC -shared -o $(PROG)
Cxterm_hzinput.o : Cxterm_hzinput.c
- gcc $(CFLAGS) -c Cxterm_hzinput.c -o Cxterm_hzinput.o
+ $(CC) $(CFLAGS) -c Cxterm_hzinput.c -o Cxterm_hzinput.o
hzinput.o : hzinput.c
- gcc $(CFLAGS) -c hzinput.c -o hzinput.o
+ $(CC) $(CFLAGS) -c hzinput.c -o hzinput.o
install: all
mkdir -p $(prefix)/lib/unicon/modules/cxterm
cp *.so $(prefix)/lib/unicon/modules/cxterm
--- unicon-3.0.4+dfsg1.orig/unicon/ImmModules/cxterm/utils/Makefile.in
+++ unicon-3.0.4+dfsg1/unicon/ImmModules/cxterm/utils/Makefile.in
@@ -4,7 +4,7 @@
CFLAGS += -I. -I..
LIBDIR = $(prefix)/lib/unicon
-LD = gcc $(CFLAGS)
+LD = @CC@ $(CFLAGS)
INSTALL = install -c
GROUP = root
--- unicon-3.0.4+dfsg1.orig/fonts/big5/Makefile.in
+++ unicon-3.0.4+dfsg1/fonts/big5/Makefile.in
@@ -6,7 +6,7 @@
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
-CC=gcc $(CFLAGS)
+CC=@CC@ $(CFLAGS)
MODCFLAGS = -Wall -O2 -DMODULE -D__KERNEL__ -DLINUX
all: $(PROG)
--- unicon-3.0.4+dfsg1.orig/fonts/gb/Makefile.in
+++ unicon-3.0.4+dfsg1/fonts/gb/Makefile.in
@@ -4,7 +4,7 @@
PROG = encode-gb.o
DESTDIR =
-CC=gcc $(CFLAGS)
+CC=@CC@ $(CFLAGS)
MODCFLAGS = -Wall -O2 -DMODULE -D__KERNEL__ -DLINUX
all: $(PROG)
--- unicon-3.0.4+dfsg1.orig/fonts/gbk/Makefile.in
+++ unicon-3.0.4+dfsg1/fonts/gbk/Makefile.in
@@ -4,7 +4,7 @@
PROG = encode-gbk.o
DESTDIR =
-CC=gcc $(CFLAGS)
+CC=@CC@ $(CFLAGS)
MODCFLAGS = -Wall -O2 -DMODULE -D__KERNEL__ -DLINUX
all: $(PROG)
--- unicon-3.0.4+dfsg1.orig/fonts/jis/Makefile.in
+++ unicon-3.0.4+dfsg1/fonts/jis/Makefile.in
@@ -4,7 +4,7 @@
PROG = encode-jis.o
DESTDIR =
-CC=gcc $(CFLAGS)
+CC=@CC@ $(CFLAGS)
MODCFLAGS = -Wall -O2 -DMODULE -D__KERNEL__ -DLINUX
all: $(PROG)
--- unicon-3.0.4+dfsg1.orig/fonts/kscm/Makefile.in
+++ unicon-3.0.4+dfsg1/fonts/kscm/Makefile.in
@@ -4,7 +4,7 @@
PROG = encode-kscm.o
DESTDIR =
-CC=gcc $(CFLAGS)
+CC=@CC@ $(CFLAGS)
MODCFLAGS = -Wall -O2 -DMODULE -D__KERNEL__ -DLINUX
all: $(PROG)
--- unicon-3.0.4+dfsg1.orig/sfonts/Makefile.in
+++ unicon-3.0.4+dfsg1/sfonts/Makefile.in
@@ -1,5 +1,5 @@
prefix=@prefix@
-CC=gcc $(CFLAGS)
+CC=@CC@ $(CFLAGS)
PROG = tools
all: $(PROG)
--- unicon-3.0.4+dfsg1.orig/sfonts/tools/Makefile.in
+++ unicon-3.0.4+dfsg1/sfonts/tools/Makefile.in
@@ -5,7 +5,7 @@
OBJS = main.o sfont.o filter.o encode-gb.o encode-gbk.o \
encode-big5.o encode-jis.o encode-kscm.o
FONT_PATH=../../fonts
-CC=gcc -g $(CFLAGS) -I. -I../../include
+CC=@CC@ -g $(CFLAGS) -I. -I../../include
all: $(PROG)
--- unicon-3.0.4+dfsg1.orig/tools/Makefile.in
+++ unicon-3.0.4+dfsg1/tools/Makefile.in
@@ -4,7 +4,7 @@
CFLAGS += -I. -I../include
PROG = uniconcfg uniconctrl
-CC=gcc $(CFLAGS)
+CC=@CC@ $(CFLAGS)
all: $(PROG)
uniconcfg:
--- unicon-3.0.4+dfsg1.orig/unicon/ImmModules/cce/inputs/Makefile.in
+++ unicon-3.0.4+dfsg1/unicon/ImmModules/cce/inputs/Makefile.in
@@ -5,7 +5,7 @@
CFLAGS += -O2 -I. -I..
LIBDIR = $(prefix)/lib/unicon
-LD = gcc $(CFLAGS) $(LDFLAGS)
+LD = @CC@ $(CFLAGS) $(LDFLAGS)
RM = rm -f
INSTALL = install -c
--- unicon-3.0.4+dfsg1.orig/sfonts/genfont/Makefile.in
+++ unicon-3.0.4+dfsg1/sfonts/genfont/Makefile.in
@@ -2,7 +2,7 @@
CFLAGS = @CFLAGS@
CFLAGS += -I.
-CC=gcc $(CFLAGS)
+CC=@CC@ $(CFLAGS)
MODCFLAGS = -Wall -O2 -DMODULE -D__KERNEL__ -DLINUX
PROG = gb gbk big5 jis kscm
--- unicon-3.0.4+dfsg1.orig/unikey/Makefile.in
+++ unicon-3.0.4+dfsg1/unikey/Makefile.in
@@ -2,7 +2,7 @@
CFLAGS = @CFLAGS@
CFLAGS += -I. -I./include -I../include -I/usr/src/linux/include -include /usr/src/linux/include/linux/modversions.h
PROG = unikey.o
-CC=gcc $(CFLAGS)
+CC=@CC@ $(CFLAGS)
DESTDIR =
MODCFLAGS = -Wall -O2 -DMODULE -D__KERNEL__ -DLINUX
