[haiku-commits] BRANCH HaikuPM-github.package-management [1faf747] src/kits/package/solver src/build/libsolv build/jam/repositories/HaikuPorts

  • From: HaikuPM-github.package-management <community@xxxxxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 5 Jul 2013 13:45:31 +0200 (CEST)

added 4 changesets to branch 'refs/remotes/HaikuPM-github/package-management'
old head: 98c6dfa41e20c57edf426197a8d9aab6223a59fd
new head: 1faf74732d88a2c8004240bb59661e2e738c9fa2
overview: https://github.com/haiku/HaikuPM/compare/98c6dfa...1faf747

----------------------------------------------------------------------------

812baf3: libsolv_build: declare missing dependency

bd915d9: BSolver: fix build host build for gcc 2
  
  gcc 2 doesn't support the weakref attribute. Rather use the regular
  (target) method to initialize sCreateSolver instead (pthread once,
  dlopen()). Since we know that we're on Haiku, that doesn't add any
  dependencies that aren't available anyway.

a65099b: libsolv_build: fix build on gcc 2 Haiku
  
  * Fix the "UseHeaders" invocation for libsolvext to use the correct
    directory.
  * Reorder things slightly, merely for aesthetical reasons.

1faf747: Update packages binutils, gcc, add missing bepdf source package

                                    [ Ingo Weinhold <ingo_weinhold@xxxxxx> ]

----------------------------------------------------------------------------

3 files changed, 27 insertions(+), 24 deletions(-)
build/jam/repositories/HaikuPorts/x86_gcc2 |  6 +++---
src/build/libsolv/Jamfile                  | 30 +++++++++++++-------------
src/kits/package/solver/Solver.cpp         | 15 +++++++------

############################################################################

Commit:      812baf3925b9f8436d531ffe07441ce65c766a23
Author:      Ingo Weinhold <ingo_weinhold@xxxxxx>
Date:        Fri Jul  5 10:14:33 2013 UTC

libsolv_build: declare missing dependency

----------------------------------------------------------------------------

diff --git a/src/build/libsolv/Jamfile b/src/build/libsolv/Jamfile
index af7e362..f73f7fa 100644
--- a/src/build/libsolv/Jamfile
+++ b/src/build/libsolv/Jamfile
@@ -93,7 +93,8 @@ actions GenerateLibsolvVersionHeader
 }
 
 local versionHeaderIn = solvversion.h.in ;
-SEARCH on $(versionHeaderIn) = $(libsolvSourceDirectory) ;
+LOCATE on $(versionHeaderIn) = $(libsolvSourceDirectory) ;
+Depends $(versionHeaderIn) : [ BuildFeatureAttribute libsolv : sources ] ;
 
 local versionHeader = [ FGristFiles solvversion.h ] ;
 MakeLocate $(versionHeader) : $(LOCATE_SOURCE) ;

############################################################################

Commit:      bd915d9f53216d1998effadf1d8ef25eafdc67a6
Author:      Ingo Weinhold <ingo_weinhold@xxxxxx>
Date:        Fri Jul  5 11:16:08 2013 UTC

BSolver: fix build host build for gcc 2

gcc 2 doesn't support the weakref attribute. Rather use the regular
(target) method to initialize sCreateSolver instead (pthread once,
dlopen()). Since we know that we're on Haiku, that doesn't add any
dependencies that aren't available anyway.

----------------------------------------------------------------------------

diff --git a/src/kits/package/solver/Solver.cpp 
b/src/kits/package/solver/Solver.cpp
index eefaf5c..29a92c9 100644
--- a/src/kits/package/solver/Solver.cpp
+++ b/src/kits/package/solver/Solver.cpp
@@ -9,16 +9,15 @@
 
 #include <package/solver/Solver.h>
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
-#      include <dlfcn.h>
-#      include <pthread.h>
-#endif
-
 
 typedef BPackageKit::BSolver* CreateSolverFunction();
 
 
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
+#if defined(HAIKU_TARGET_PLATFORM_HAIKU) || __GNUC__ == 2
+
+
+#include <dlfcn.h>
+#include <pthread.h>
 
 
 static CreateSolverFunction* sCreateSolver = NULL;
@@ -29,7 +28,11 @@ static pthread_once_t sLoadLibsolvSolverAddOnInitOnce = 
PTHREAD_ONCE_INIT;
 static void
 load_libsolv_solver_add_on()
 {
+#if defined(HAIKU_TARGET_PLATFORM_HAIKU) || __GNUC__ == 2
        void* imageHandle = dlopen("libpackage-add-on-libsolv.so", 0);
+#else
+       void* imageHandle = dlopen("libpackage-add-on-libsolv_build.so", 0);
+#endif
        if (imageHandle == NULL)
                return;
 

############################################################################

Commit:      a65099bbe401707176af28aee5547b19624d169c
Author:      Ingo Weinhold <ingo_weinhold@xxxxxx>
Date:        Fri Jul  5 11:23:48 2013 UTC

libsolv_build: fix build on gcc 2 Haiku

* Fix the "UseHeaders" invocation for libsolvext to use the correct
  directory.
* Reorder things slightly, merely for aesthetical reasons.

----------------------------------------------------------------------------

diff --git a/src/build/libsolv/Jamfile b/src/build/libsolv/Jamfile
index f73f7fa..07e4b45 100644
--- a/src/build/libsolv/Jamfile
+++ b/src/build/libsolv/Jamfile
@@ -6,16 +6,6 @@ local libsolvSourceDirectory = [ FDirName 
$(libsolvSourceBaseDirectory) src ] ;
 local libsolvextSourceDirectory
        = [ FDirName $(libsolvSourceBaseDirectory) ext ] ;
 
-UseHeaders $(libsolvSourceDirectory) ;
-
-local libsolvSources = [ FGristFiles
-       bitmap.c poolarch.c poolvendor.c poolid.c strpool.c dirpool.c
-       solver.c solverdebug.c repo_solv.c repo_write.c evr.c pool.c
-       queue.c repo.c repodata.c repopage.c util.c policy.c solvable.c
-       transaction.c rules.c problems.c
-       chksum.c md5.c sha1.c sha2.c solvversion.c selection.c
-       ] ;
-
 local libsolvMajor = 0 ;
 local libsolvMinor = 3 ;
 local libsolvPatch = 0 ;
@@ -45,6 +35,16 @@ SubDirCcFlags -Wno-sign-compare -Wno-missing-prototypes ;
 
 # libsolv
 
+UseHeaders $(libsolvSourceDirectory) ;
+
+local libsolvSources = [ FGristFiles
+       bitmap.c poolarch.c poolvendor.c poolid.c strpool.c dirpool.c
+       solver.c solverdebug.c repo_solv.c repo_write.c evr.c pool.c
+       queue.c repo.c repodata.c repopage.c util.c policy.c solvable.c
+       transaction.c rules.c problems.c
+       chksum.c md5.c sha1.c sha2.c solvversion.c selection.c
+       ] ;
+
 LOCATE on $(libsolvSources) = $(libsolvSourceDirectory) ;
 Depends $(libsolvSources) : [ BuildFeatureAttribute libsolv : sources ] ;
 
@@ -55,16 +55,15 @@ BuildPlatformSharedLibrary libsolv_build.so
        $(libsolvSources)
        ;
 
-UseHeaders $(libsolvSourceDirectory) ;
+# libsolvext
+
+UseHeaders $(libsolvextSourceDirectory) ;
 
 local libsolvextSources = [ FGristFiles
        solv_xfopen.c testcase.c
        repo_haiku.cpp
        ] ;
 
-
-# libsolvext
-
 LOCATE on $(libsolvextSources) = $(libsolvextSourceDirectory) ;
 Depends $(libsolvextSources) : [ BuildFeatureAttribute libsolv : sources ] ;
 

############################################################################

Commit:      1faf74732d88a2c8004240bb59661e2e738c9fa2
Author:      Ingo Weinhold <ingo_weinhold@xxxxxx>
Date:        Fri Jul  5 11:26:12 2013 UTC

Update packages binutils, gcc, add missing bepdf source package

----------------------------------------------------------------------------

diff --git a/build/jam/repositories/HaikuPorts/x86_gcc2 
b/build/jam/repositories/HaikuPorts/x86_gcc2
index baa1f5c..3765f5b 100644
--- a/build/jam/repositories/HaikuPorts/x86_gcc2
+++ b/build/jam/repositories/HaikuPorts/x86_gcc2
@@ -15,7 +15,7 @@ PackageRepository HaikuPorts
        automake-1.13.1-4
        bepdf-1.1.1~beta5_2013_04_28-1
 #      bezillabrowser-2.0.0.22pre_2010_05_02-1
-       binutils-2.17_130421-2
+       binutils-2.17_2013_04_21-1
        bison-2.4.3-5
        bzip2-1.0.6-3
        cdrtools-3.01~a07-3
@@ -30,7 +30,7 @@ PackageRepository HaikuPorts
        flex-2.5.35-6
        freetype-2.4.9-2
        freetype_devel-2.4.9-2
-       gcc-2.95.3_130425-2
+       gcc-2.95.3_2013_05_04-1
        gettext-0.18.1.1-4
        gettext_libintl-0.18.1.1-4
        git-1.7.10.2-2
@@ -103,7 +103,7 @@ PackageRepository HaikuPorts
        apr
        autoconf
        automake
-#      bepdf
+       bepdf
        binutils
        bison
        bzip2


Other related posts:

  • » [haiku-commits] BRANCH HaikuPM-github.package-management [1faf747] src/kits/package/solver src/build/libsolv build/jam/repositories/HaikuPorts - HaikuPM-github . package-management