debian/cdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix broken linux builds caused by recent DtHelp/Imakefile jpeg change

Browse Source 
A patch from Pascal Stumpf using external jpeg broke linux builds,
since libjpeg needs to be linked in when using a remote jpeg lib.

So, in lnxLib.tmpl, define SharedDtHelpReqs so -ljpeg is used.  Also,
in DtHelp/Imakefile, use proper Arch defines so external jpeg libs are
only used on linux, fbsd, and obsd systems.
This commit is contained in:
Jon Trulson
2012-08-12 17:31:28 -06:00
parent 2b8bd0743b
commit fa3ad160e4
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cde/config/cf/lnxLib.tmpl
View File

@@ -42,3 +42,6 @@ XMULIB = -lXmu $(XLIB)
# define SharedCsaReqs -lXt # define SharedCsaReqs -lXt
#endif #endif
#ifndef SharedDtHelpReqs
# define SharedDtHelpReqs -ljpeg
#endif

10
cde/lib/DtHelp/Imakefile
View File

@@ -13,8 +13,14 @@ XCOMM $XConsortium: Imakefile /main/25 1996/11/22 11:17:34 drk $
#define IHaveSubdirs #define IHaveSubdirs
#define PassCDebugFlags /**/ #define PassCDebugFlags /**/
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
SUBDIRS = il SUBDIRS = il
DONES = il/DONE DONES = il/DONE
#else
SUBDIRS = il jpeg
DONES = il/DONE jpeg/DONE
#endif
EXTRALIBRARYDEPS = $(DONES) EXTRALIBRARYDEPS = $(DONES)
MakeSubdirs($(SUBDIRS)) MakeSubdirs($(SUBDIRS))
@@ -149,7 +155,11 @@ JPEG_OBJS = \
jpeg/jdinput.o jpeg/jerror.o jpeg/jutils.o jpeg/jdinput.o jpeg/jerror.o jpeg/jutils.o
SRCS = $(SRCS1) $(SRCS2) $(CVSRCS) $(LCXSRCS) SRCS = $(SRCS1) $(SRCS2) $(CVSRCS) $(LCXSRCS)
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
OBJS = $(OBJS1) $(OBJS2) $(CVOBJS) $(LCXOBJS) $(IL_OBJS) OBJS = $(OBJS1) $(OBJS2) $(CVOBJS) $(LCXOBJS) $(IL_OBJS)
#else
OBJS = $(OBJS1) $(OBJS2) $(CVOBJS) $(LCXOBJS) $(IL_OBJS) $(JPEG_OBJS)
#endif
#include <Library.tmpl> #include <Library.tmpl>