Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
DISCONTINUED:openSUSE:11.1:Update
blt
blt2.4z.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File blt2.4z.patch of Package blt
--- LICENSE +++ LICENSE @@ -0,0 +1,21 @@ + * + * Copyright 1993-1998 Lucent Technologies, Inc. + * + * Permission to use, copy, modify, and distribute this software and + * its documentation for any purpose and without fee is hereby + * granted, provided that the above copyright notice appear in all + * copies and that both that the copyright notice and warranty + * disclaimer appear in supporting documentation, and that the names + * of Lucent Technologies any of their entities not be used in + * advertising or publicity pertaining to distribution of the software + * without specific, written prior permission. + * + * Lucent Technologies disclaims all warranties with regard to this + * software, including all implied warranties of merchantability and + * fitness. In no event shall Lucent Technologies be liable for any + * special, indirect or consequential damages or any damages + * whatsoever resulting from loss of use, data or profits, whether in + * an action of contract, negligence or other tortuous action, arising + * out of or in connection with the use or performance of this + * software. + * --- Makefile.in +++ Makefile.in @@ -28,6 +28,7 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ +INSTALL_DIR = @INSTALL_DIR@ INSTALL_ROOT = SHELL = /bin/sh RM = rm -f @@ -47,9 +48,9 @@ (cd library; $(MAKE) install) (cd man; $(MAKE) install) (cd demos; $(MAKE) install) - $(INSTALL_DATA) $(srcdir)/README $(INSTALL_DIR)$(scriptdir) - $(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_DIR)$(scriptdir) - $(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_DIR)$(scriptdir) + #$(INSTALL_DATA) $(srcdir)/README $(INSTALL_ROOT)$(scriptdir) + #$(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_ROOT)$(scriptdir) + #$(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_ROOT)$(scriptdir) mkdirs: @for i in $(instdirs) ; do \ @@ -57,7 +58,7 @@ : ; \ else \ echo " mkdir $(INSTALL_ROOT)$$i" ; \ - mkdir $(INSTALL_ROOT)$$i ; \ + mkdir -p $(INSTALL_ROOT)$$i ; \ fi ; \ done --- configure +++ configure @@ -3756,7 +3756,7 @@ BLT_VERSION=${BLT_MAJOR_VERSION}.${BLT_MINOR_VERSION} # Add BLT to the run path -libdir=${exec_prefix}/lib +#libdir=${exec_prefix}/lib if test "x${libdir}" != "x" -a \ "${libdir}" != "/usr/lib" -a \ --- configure.in +++ configure.in @@ -332,48 +332,17 @@ AC_MSG_CHECKING([whether DBL_EPSILON is defined in float.h]) AC_CACHE_VAL(blt_cv_found_dbl_epsilon, - AC_EGREP_CPP(yes, - [ + AC_TRY_CPP([ #ifdef HAVE_FLOAT_H #include <float.h> #endif -#ifdef DBL_EPSILON - yes +#ifndef DBL_EPSILON +#error DBL_EPSILON is not defined #endif ], blt_cv_found_dbl_epsilon=yes, blt_cv_found_dbl_epsilon=no) ) AC_MSG_RESULT([${blt_cv_found_dbl_epsilon}]) -if test "${blt_cv_found_dbl_epsilon}" = "no" ; then - AC_CACHE_VAL(blt_cv_dbl_epsilon, - old_flags="$CFLAGS" - CFLAGS="-g -lm" - AC_MSG_CHECKING([whether DBL_EPSILON can be computed]) - AC_TRY_RUN_WITH_OUTPUT(blt_cv_dbl_epsilon, [ -main () { - double e, u; - /* - * Check the smallest value such that 1.0 + x != 1.0. - * For ANSI compilers this is DBL_EPSILON in float.h - */ - u = 1.0; - for(;;) { - u *= 0.5; - if ((1.0 + u) == 1.0) { - break; - } - } - e = u * 2.0; - printf("%.17e\n", e); - exit(0); -}]) - CFLAGS="$old_flags" - AC_DEFINE_UNQUOTED(BLT_DBL_EPSILON, ${blt_cv_dbl_epsilon}) - AC_MSG_RESULT([${blt_cv_dbl_epsilon}]) -) -fi - - AC_MSG_CHECKING([whether declaration is needed for strdup]) AC_CACHE_VAL(blt_cv_nedd_decl_strdup, AC_EGREP_CPP(strdup, [ @@ -976,7 +945,7 @@ BLT_VERSION=${BLT_MAJOR_VERSION}.${BLT_MINOR_VERSION} # Add BLT to the run path -libdir=${exec_prefix}/lib +#libdir=${exec_prefix}/lib if test "x${libdir}" != "x" -a \ "${libdir}" != "/usr/lib" -a \ @@ -1199,7 +1168,6 @@ SHLIB_CFLAGS="-fPIC" SHLIB_LD="${CC}" SHLIB_LD_FLAGS='-rdynamic -shared -Wl,-E -Wl,-soname,$@' - LD_RUN_PATH="-Wl,-rpath,${loader_run_path}" LDFLAGS="" EXTRA_LIB_SPECS="-ldl" --- demos/Makefile.in +++ demos/Makefile.in @@ -6,7 +6,7 @@ exec_prefix = @exec_prefix@ version = @BLT_VERSION@ libdir = @libdir@ -scriptdir = $(prefix)/lib/blt$(version) +scriptdir = @BLT_LIBRARY@ destdir = $(scriptdir)/demos srcdir = @srcdir@ @@ -14,6 +14,7 @@ RM = rm -rf INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ +INSTALL_DIR = $(INSTALL) -d -m 755 INSTALL_ROOT = instdirs = $(prefix) \ @@ -78,8 +79,8 @@ if test -d $(INSTALL_ROOT)"$$i" ; then \ : ; \ else \ - echo " mkdir $(INSTALL_ROOT)$$i" ; \ - mkdir $(INSTALL_ROOT)"$$i" ; \ + echo " $(INSTALL_DIR) $(INSTALL_ROOT)$$i" ; \ + $(INSTALL_DIR) $(INSTALL_ROOT)"$$i" ; \ fi ; \ done --- library/Makefile.in +++ library/Makefile.in @@ -12,6 +12,7 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ +INSTALL_DIR = $(INSTALL) -d -m 755 INSTALL_ROOT = RM = rm -f SHELL = /bin/sh @@ -58,15 +59,15 @@ for i in $(miscFiles) ; do \ $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(scriptdir) ; \ done - $(INSTALL_DATA) pkgIndex.tcl $(scriptdir) + $(INSTALL_DATA) pkgIndex.tcl $(INSTALL_ROOT)$(scriptdir) mkdirs: @for i in $(instdirs) ; do \ if test -d $(INSTALL_ROOT)$$i ; then \ : ; \ else \ - echo " mkdir $(INSTALL_ROOT)$$i" ; \ - mkdir $(INSTALL_ROOT)$$i ; \ + echo " $(INSTALL_DIR) $(INSTALL_ROOT)$$i" ; \ + $(INSTALL_DIR) $(INSTALL_ROOT)$$i ; \ fi ; \ done --- library/pkgIndex.tcl.in +++ library/pkgIndex.tcl.in @@ -1,39 +1,5 @@ # Tcl package index file, version 1.0 - -proc LoadBLT { version dir } { - - set prefix "%LIB_PREFIX%" - set suffix [info sharedlibextension] - regsub {\.} $version {} version_no_dots - - # Determine whether to load the full BLT library or - # the "lite" tcl-only version. - - if { [info commands tk] == "tk" } { - set name ${prefix}BLT${version_no_dots}${suffix} - } else { - set name ${prefix}BLTlite${version_no_dots}${suffix} - } - - global tcl_platform - if { $tcl_platform(platform) == "unix" } { - set library [file join $dir $name] - if { ![file exists $library] } { - # Try the parent directory. - set library [file join [file dirname $dir] $name] - } - if { ![file exists $library] } { - # Default to the path generated at compilation. - set library [file join "%LIB_DIR%" $name] - } - } else { - set library $name - } - load $library BLT +package ifneeded BLT "%VERSION%" { + load libBLT[expr {[info commands tk]!="tk"?"lite":""}][regsub {\.} "%VERSION%" {}].so BLT } - -set version "%VERSION%" - -package ifneeded BLT $version [list LoadBLT $version $dir] - # End of package index file --- man/Makefile.in +++ man/Makefile.in @@ -27,6 +27,7 @@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ +INSTALL_DIR = $(INSTALL) -d -m 755 INSTALL_ROOT = SHELL = /bin/sh RM = rm -rf @@ -51,8 +52,8 @@ if test -d $(INSTALL_ROOT)$$i ; then \ : ; \ else \ - echo " mkdir $(INSTALL_ROOT)$$i" ; \ - mkdir $(INSTALL_ROOT)$$i ; \ + echo " $(INSTALL_DIR) $(INSTALL_ROOT)$$i" ; \ + $(INSTALL_DIR) $(INSTALL_ROOT)$$i ; \ fi ; \ done --- src/Makefile.in +++ src/Makefile.in @@ -24,7 +24,7 @@ exec_prefix = @exec_prefix@ incdir = $(prefix)/include libdir = @libdir@ -scriptdir = $(exec_prefix)/lib +scriptdir = @BLT_LIBRARY@ prefix = @prefix@ srcdir = @srcdir@ @@ -143,6 +143,7 @@ CC_SWITCHES = $(EXTRA_CFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES) INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ +INSTALL_DIR = $(INSTALL) -d -m 755 INSTALL_ROOT = RANLIB = @RANLIB@ SHELL = /bin/sh @@ -206,8 +207,8 @@ if test -d $(INSTALL_ROOT)$$i ; then \ : ; \ else \ - echo " mkdir $(INSTALL_ROOT)$$i" ; \ - mkdir $(INSTALL_ROOT)$$i ; \ + echo " $(INSTALL_DIR) $(INSTALL_ROOT)$$i" ; \ + $(INSTALL_DIR) $(INSTALL_ROOT)$$i ; \ fi ; \ done --- src/bltTree.c +++ src/bltTree.c @@ -96,16 +96,16 @@ #define REBUILD_MULTIPLIER 3 -#if (SIZEOF_VOID_P == 8) -#define RANDOM_INDEX(i) HashOneWord(mask, downshift, i) -#define BITSPERWORD 64 -#else - #define START_LOGSIZE 5 /* Initial hash table size is 32. */ #define MAX_LIST_VALUES 20 /* Convert to hash table when node * value list gets bigger than this * many values. */ +#if (SIZEOF_VOID_P == 8) +#define RANDOM_INDEX(i) HashOneWord(mask, downshift, i) +#define BITSPERWORD 64 +#else + /* * The following macro takes a preliminary integer hash value and * produces an index into a hash tables bucket list. The idea is --- src/shared/Makefile.in +++ src/shared/Makefile.in @@ -114,6 +114,7 @@ CC_SWITCHES = $(EXTRA_CFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES) INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ +INSTALL_DIR = $(INSTALL) -d -m 755 INSTALL_ROOT = SHELL = /bin/sh RM = rm -f @@ -169,8 +170,8 @@ if test -d $(INSTALL_ROOT)$$i ; then \ : ;\ else \ - echo " mkdir $(INSTALL_ROOT)$$i" ; \ - mkdir $(INSTALL_ROOT)$$i ; \ + echo " $(INSTALL_DIR) $(INSTALL_ROOT)$$i" ; \ + $(INSTALL_DIR) $(INSTALL_ROOT)$$i ; \ fi ; \ done clean:
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
