mirror of
git://git.code.sf.net/p/cdesktopenv/code
synced 2025-03-09 15:50:02 +00:00
ksh93: fix BSD builds due to iconv confusion
For the BSD's we do not want to pass CFLAGS since it includes a -I/usr/local/incude directive. This breaks ksh's iconv detection due to the weird way in which iconv seems to be handled on the BSD's - both a libc impl (preferred), and a possibly external GNU iconv impl installed in /usr/local. /usr/local/include is added to CFLAGS by the X11/Motif detection logic - since that is where all of the needed headers are on the BSDs. One of the patches from Martijn Decker added CFLAGS to the ksh93 build CCFLAGS which made this problem show up. So until/unless that is fixed in ksh93, we will avoid sending anything to the ksh build system except for SUIDEXECDEFINES
This commit is contained in:
parent
b4e936f6f8
commit
81c3c7b0eb
1 changed files with 20 additions and 1 deletions
|
@ -55,8 +55,27 @@ dtksh_SOURCES = init.c \
|
|||
extra.c \
|
||||
msgs.c
|
||||
|
||||
# for the BSD's we do not want to pass CFLAGS since it includes a
|
||||
# -I/usr/local/incude directive. This breaks ksh's iconv
|
||||
# detection due to the weird way in which iconv seems to be handled on
|
||||
# the BSD's - both a libc impl (preferred), and a possibly external
|
||||
# GNU iconv impl installed in /usr/local.
|
||||
#
|
||||
# /usr/local/include is added to CFLAGS by the X11/Motif detection
|
||||
# logic - since that is where all of the needed headers are on the
|
||||
# BSDs.
|
||||
#
|
||||
# So until/unless that is fixed in ksh93, we will avoid sending
|
||||
# anything to the ksh build system except for SUIDEXECDEFINES
|
||||
|
||||
if BSD
|
||||
KSH93_CCFLAGS=$(SUIDEXECDEFINES)
|
||||
else
|
||||
KSH93_CCFLAGS=$(CFLAGS) $(SUIDEXECDEFINES)
|
||||
endif
|
||||
|
||||
ksh93/bin/ksh:
|
||||
ksh93/bin/package flat make CCFLAGS='$(CFLAGS) $(SUIDEXECDEFINES)'
|
||||
ksh93/bin/package flat make CCFLAGS='$(KSH93_CCFLAGS)'
|
||||
|
||||
init.c: ksh93/bin/ksh
|
||||
$(CP) ksh93/src/cmd/ksh93/sh/init.c ./
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue