Changeset 18971
- Timestamp:
- 06/25/06 21:41:46 (2 years ago)
- Files:
-
- juggler/trunk/modules/jackal/ChangeLog (modified) (1 diff)
- juggler/trunk/modules/jackal/Makefile.inc.in (modified) (1 diff)
- juggler/trunk/modules/jackal/VERSION (modified) (1 diff)
- juggler/trunk/modules/jackal/common.defs.mk.in (modified) (2 diffs)
- juggler/trunk/modules/jackal/configure.ac (modified) (2 diffs)
- juggler/trunk/modules/jackal/plugins/common.defs.mk.in (modified) (2 diffs)
- juggler/trunk/modules/jackal/plugins/configure.ac (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
juggler/trunk/modules/jackal/ChangeLog
r18888 r18971 1 1 DATE AUTHOR CHANGE 2 2 ----------- ----------- ------------------------------------------------------- 3 Jun-25-2006 patrick Added support for building universal binaries on Mac 4 OS X. 5 NEW VERSION: 1.1.5 3 6 May-24-2006 dshipton Versioning of all data and libraries for parallel 4 7 installations. juggler/trunk/modules/jackal/Makefile.inc.in
r18948 r18971 192 192 @$(SHELL) $(MKINSTALLDIRS) $(LIBDIR) 193 193 ifeq (@PLATFORM@, Darwin) 194 ifeq ($(ISA), universal) 195 for a in $(UNIVERSAL_ARCH_LIST) ; do \ 196 ld -arch $$a -dynamic -m -r -d -bind_at_load -o \ 197 $(subst .dylib,-$$a.lo,$@) $(OBJS) ; \ 198 done 199 lipo -create $(foreach arch,$(UNIVERSAL_ARCH_LIST),$(subst .dylib,-$(arch).lo,$@)) -output $(subst .dylib,.lo,$@) 200 else 194 201 ld -dynamic -m -r -d -bind_at_load -o $(subst .dylib,.lo,$@) $(OBJS) 202 endif 195 203 $(CXX) $(EXTRA_LDOPTS) -Wl,-dynamic -nostartfiles -Wl,-dylib \ 196 204 -Wl,-ldylib1.o $(LDOPTS) -o $@ $(subst .dylib,.lo,$@) \ 197 205 $(DYLIB_DEPS_JCCL) 198 rm -f $( subst .dylib,.lo,$@)206 rm -f $(@D)/*.lo 199 207 else 200 208 $(CXX_DLL) $(LDOPTS) $(DYLIB_NAME_FLAG) $(OBJS) $(DYLIB_DEPS_JCCL) juggler/trunk/modules/jackal/VERSION
r18888 r18971 1 1.1.5-0 @06/26/2006 02:45:00 UTC@ 1 2 1.1.4-0 @05/24/2006 20:40:00 UTC@ 2 3 1.1.3-0 @10/10/2005 16:55:00 UTC@ juggler/trunk/modules/jackal/common.defs.mk.in
r18604 r18971 218 218 OBJ_NAME_FLAG= @OBJ_NAME_FLAG@ 219 219 OS_TYPE= @OS_TYPE@ 220 PLATFORM_SDK= @PLATFORM_SDK@ 220 221 PERL= @PERL@ 221 222 RANLIB= @RANLIB@ 222 223 RMIC= @RMIC@ 224 UNIVERSAL_ARCH_LIST= @UNIVERSAL_ARCH_LIST@ 223 225 224 226 # Warning levels for C and C++ needed by dpp.obj-common.mk. … … 365 367 endif 366 368 endif 369 ifeq ($(ABI), Mach-O) 370 ifeq ($(ISA), powerpc) 371 CFLAGS+= -arch ppc $(PLATFORM_SDK) 372 CXXFLAGS+= -arch ppc $(PLATFORM_SDK) 373 LDOPTS+= -arch ppc $(PLATFORM_SDK) 374 endif 375 ifeq ($(ISA), i386) 376 CFLAGS+= -arch i386 $(PLATFORM_SDK) 377 CXXFLAGS+= -arch i386 $(PLATFORM_SDK) 378 LDOPTS+= -arch i386 $(PLATFORM_SDK) 379 endif 380 ifeq ($(ISA), universal) 381 CFLAGS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 382 $(PLATFORM_SDK) 383 CXXFLAGS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 384 $(PLATFORM_SDK) 385 LDOPTS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 386 $(PLATFORM_SDK) 387 endif 388 endif 367 389 368 390 endif juggler/trunk/modules/jackal/configure.ac
r18944 r18971 39 39 AC_REVISION($Revision$) 40 40 AC_CONFIG_AUX_DIR([../../share/config]) 41 DPP_PREREQ([2.1. 0])41 DPP_PREREQ([2.1.2]) 42 42 DPP_INIT 43 43 … … 175 175 # Checks for libraries. 176 176 # ----------------------------------------------------------------------------- 177 VPR_PATH([1.1. 10], BUILD_CXX='Y',177 VPR_PATH([1.1.23], BUILD_CXX='Y', 178 178 [AC_MSG_WARN([*** VPR required for JCCL ***]) 179 179 BUILD_CXX='N']) juggler/trunk/modules/jackal/plugins/common.defs.mk.in
r18684 r18971 218 218 OBJ_NAME_FLAG= @OBJ_NAME_FLAG@ 219 219 OS_TYPE= @OS_TYPE@ 220 PLATFORM_SDK= @PLATFORM_SDK@ 220 221 PERL= @PERL@ 221 222 RANLIB= @RANLIB@ 222 223 RMIC= @RMIC@ 224 UNIVERSAL_ARCH_LIST= @UNIVERSAL_ARCH_LIST@ 223 225 224 226 # Warning levels for C and C++ needed by dpp.obj-common.mk. … … 365 367 endif 366 368 endif 369 ifeq ($(ABI), Mach-O) 370 ifeq ($(ISA), powerpc) 371 CFLAGS+= -arch ppc $(PLATFORM_SDK) 372 CXXFLAGS+= -arch ppc $(PLATFORM_SDK) 373 LDOPTS+= -arch ppc $(PLATFORM_SDK) 374 endif 375 ifeq ($(ISA), i386) 376 CFLAGS+= -arch i386 $(PLATFORM_SDK) 377 CXXFLAGS+= -arch i386 $(PLATFORM_SDK) 378 LDOPTS+= -arch i386 $(PLATFORM_SDK) 379 endif 380 ifeq ($(ISA), universal) 381 CFLAGS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 382 $(PLATFORM_SDK) 383 CXXFLAGS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 384 $(PLATFORM_SDK) 385 LDOPTS+= $(foreach arch,$(UNIVERSAL_ARCH_LIST),-arch $(arch)) \ 386 $(PLATFORM_SDK) 387 endif 388 endif 367 389 368 390 endif juggler/trunk/modules/jackal/plugins/configure.ac
r18934 r18971 38 38 AC_REVISION($Revision$) 39 39 AC_CONFIG_AUX_DIR([../../../share/config]) 40 DPP_PREREQ([ 1.5.1])40 DPP_PREREQ([2.1.2]) 41 41 DPP_INIT 42 42 … … 138 138 # Checks for libraries. 139 139 # ----------------------------------------------------------------------------- 140 jccl_version='1.1. 3'140 jccl_version='1.1.5' 141 141 JCCL_PATH_CXX([$jccl_version], [test_tweek_cxx='Y'], 142 142 [AC_MSG_WARN([*** JCCL C++ API required for JCCL C++ plug-ins ***]) … … 144 144 ]) 145 145 146 min_tweek_version=' 0.20.0'146 min_tweek_version='1.1.5' 147 147 if test "x$test_tweek_cxx" = "xY" ; then 148 148 TWEEK_PATH_CXX([$min_tweek_version], [HAVE_TWEEK_CXX='Y'],
