Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 502338
Collapse All | Expand All

(-) (+18 lines)
Added Link Here
1
INCLUDE(Platform/UnixPaths)
2
3
set(CMAKE_C_COMPILE_OPTIONS_PIC "")
4
set(CMAKE_CXX_COMPILE_OPTIONS_PIC "")
5
set(CMAKE_SHARED_LIBRARY_C_FLAGS "")
6
set(CMAKE_SHARED_LIBRARY_CXX_FLAGS "")
7
set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostdlib -Wl,-r")
8
set(CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS "-nostdlib -Wl,-r")
9
set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)
10
set(CMAKE_FIND_LIBRARY_PREFIXES "lib")
11
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
12
set(CMAKE_CXX_LINK_SHARED_LIBRARY )
13
set(CMAKE_CXX_LINK_MODULE_LIBRARY )
14
set(CMAKE_C_LINK_SHARED_LIBRARY )
15
set(CMAKE_C_LINK_MODULE_LIBRARY )
16
set(CMAKE_DL_LIBS "dld" )
17
set(CMAKE_SHARED_LIBRARY_PREFIX "lib")    
18
set(CMAKE_SHARED_LIBRARY_SUFFIX ".a")           # .a
(-)Modules/FindCURL.cmake.orig (-1 / +1 lines)
Lines 56-61 Link Here
56
                                  VERSION_VAR CURL_VERSION_STRING)
56
                                  VERSION_VAR CURL_VERSION_STRING)
57
57
58
if(CURL_FOUND)
58
if(CURL_FOUND)
59
  set(CURL_LIBRARIES ${CURL_LIBRARY})
59
  set(CURL_LIBRARIES ${CURL_LIBRARY} ssl crypto)
60
  set(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIR})
60
  set(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIR})
61
endif()
61
endif()
(-)Modules/FindLibArchive.cmake.old (-1 / +1 lines)
Lines 62-66 Link Here
62
62
63
if(LibArchive_FOUND)
63
if(LibArchive_FOUND)
64
  set(LibArchive_INCLUDE_DIRS ${LibArchive_INCLUDE_DIR})
64
  set(LibArchive_INCLUDE_DIRS ${LibArchive_INCLUDE_DIR})
65
  set(LibArchive_LIBRARIES    ${LibArchive_LIBRARY})
65
  set(LibArchive_LIBRARIES    ${LibArchive_LIBRARY} bz2 lzma xml2 z ssl crypto)
66
endif()
66
endif()
(-)Source/cmakemain.cxx.old (+5 lines)
Lines 326-331 Link Here
326
  std::cout.flush();
326
  std::cout.flush();
327
}
327
}
328
328
329
#if defined (atarist)
330
/* The Atari operating system doesn't have a dynamic stack.  The
331
   stack size is determined from this value.  */
332
long _stksize = 256 * 1024;
333
#endif
329
334
330
int main(int ac, char** av)
335
int main(int ac, char** av)
331
{
336
{
(-)Source/ctest.cxx.old (+6 lines)
Lines 261-266 Link Here
261
  {0, 0, 0}
261
  {0, 0, 0}
262
};
262
};
263
263
264
#if defined (atarist)
265
/* The Atari operating system doesn't have a dynamic stack.  The
266
   stack size is determined from this value.  */
267
long _stksize = 256 * 1024;
268
#endif
269
264
// this is a test driver program for cmCTest.
270
// this is a test driver program for cmCTest.
265
int main (int argc, char *argv[])
271
int main (int argc, char *argv[])
266
{
272
{
(-)Source/kwsys/DynamicLoader.cxx (-3 / +12 lines)
Lines 445-459 Link Here
445
  char *name = (char *)calloc(1, strlen(libname) + 1);
445
  char *name = (char *)calloc(1, strlen(libname) + 1);
446
  dld_init(program_invocation_name);
446
  dld_init(program_invocation_name);
447
  strncpy(name, libname, strlen(libname));
447
  strncpy(name, libname, strlen(libname));
448
  dld_link(libname);
448
  if (dld_link(libname)) {
449
    free(name);
450
    return NULL;
451
  }
449
  return (void *)name;
452
  return (void *)name;
450
}
453
}
451
454
452
//----------------------------------------------------------------------------
455
//----------------------------------------------------------------------------
453
int DynamicLoader::CloseLibrary(DynamicLoader::LibraryHandle lib)
456
int DynamicLoader::CloseLibrary(DynamicLoader::LibraryHandle lib)
454
{
457
{
455
  dld_unlink_by_file((char *)lib, 0);
458
  if (lib) {
456
  free(lib);
459
    int error = dld_unlink_by_file((char *)lib, 0);
460
461
    free(lib);
462
    
463
    if (!error)
464
      return 1;
465
  }
457
  return 0;
466
  return 0;
458
}
467
}
459
468
(-)Source/kwsys/SystemInformation.cxx (-5 / +6 lines)
Lines 60-68 Link Here
60
# if defined(KWSYS_SYS_HAS_PSAPI)
60
# if defined(KWSYS_SYS_HAS_PSAPI)
61
#  include <psapi.h>
61
#  include <psapi.h>
62
# endif
62
# endif
63
# if !defined(siginfo_t)
64
typedef int siginfo_t;
65
# endif
66
#else
63
#else
67
# include <sys/types.h>
64
# include <sys/types.h>
68
# include <sys/time.h>
65
# include <sys/time.h>
Lines 208-213 Link Here
208
# define USE_CPUID 0
205
# define USE_CPUID 0
209
#endif
206
#endif
210
207
208
#if !defined(siginfo_t)
209
typedef int siginfo_t;
210
#endif
211
211
#if USE_CPUID
212
#if USE_CPUID
212
213
213
#define CPUID_AWARE_COMPILER
214
#define CPUID_AWARE_COMPILER
Lines 1037-1043 Link Here
1037
#endif
1038
#endif
1038
1039
1039
// ****************************************************************************
1040
// ****************************************************************************
1040
#if !defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
1041
#if !defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__MINT__)
1041
void StacktraceSignalHandler(
1042
void StacktraceSignalHandler(
1042
      int sigNo,
1043
      int sigNo,
1043
      siginfo_t *sigInfo,
1044
      siginfo_t *sigInfo,
Lines 3340-3346 Link Here
3340
*/
3341
*/
3341
void SystemInformationImplementation::SetStackTraceOnError(int enable)
3342
void SystemInformationImplementation::SetStackTraceOnError(int enable)
3342
{
3343
{
3343
#if !defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__)
3344
#if !defined(_WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__MINT__)
3344
  static int saOrigValid=0;
3345
  static int saOrigValid=0;
3345
  static struct sigaction saSEGVOrig;
3346
  static struct sigaction saSEGVOrig;
3346
  static struct sigaction saTERMOrig;
3347
  static struct sigaction saTERMOrig;

Return to bug 502338