[haiku-commits] BRANCH HaikuPM-github.package-management [4dd0ed4] in src: kits/package/solver build/libsolv
- From: HaikuPM-github.package-management <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 5 Jul 2013 14:00:32 +0200 (CEST)
added 2 changesets to branch 'refs/remotes/HaikuPM-github/package-management'
old head: 1faf74732d88a2c8004240bb59661e2e738c9fa2
new head: 4dd0ed48e3dd486d3f2e8c15eeb90466cd5b0229
overview: https://github.com/haiku/HaikuPM/compare/1faf747...4dd0ed4
----------------------------------------------------------------------------
fdf111a: libsolvext requires libz
4dd0ed4: BSolver: fix for gcc 2
Missed one #if, so sCreateSolver was never initialized.
[ Ingo Weinhold <ingo_weinhold@xxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 2 insertions(+), 1 deletion(-)
src/build/libsolv/Jamfile | 1 +
src/kits/package/solver/Solver.cpp | 2 +-
############################################################################
Commit: fdf111aa575d03298a825a7b8c109ba3ea7f85b0
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Fri Jul 5 11:45:25 2013 UTC
libsolvext requires libz
----------------------------------------------------------------------------
diff --git a/src/build/libsolv/Jamfile b/src/build/libsolv/Jamfile
index 07e4b45..f7e41f2 100644
--- a/src/build/libsolv/Jamfile
+++ b/src/build/libsolv/Jamfile
@@ -77,6 +77,7 @@ BuildPlatformSharedLibrary libsolvext_build.so
:
libsolv_build.so
libpackage_build.so
+ z
;
############################################################################
Commit: 4dd0ed48e3dd486d3f2e8c15eeb90466cd5b0229
Author: Ingo Weinhold <ingo_weinhold@xxxxxx>
Date: Fri Jul 5 11:53:25 2013 UTC
BSolver: fix for gcc 2
Missed one #if, so sCreateSolver was never initialized.
----------------------------------------------------------------------------
diff --git a/src/kits/package/solver/Solver.cpp
b/src/kits/package/solver/Solver.cpp
index 29a92c9..3c16485 100644
--- a/src/kits/package/solver/Solver.cpp
+++ b/src/kits/package/solver/Solver.cpp
@@ -68,7 +68,7 @@ BSolver::~BSolver()
/*static*/ status_t
BSolver::Create(BSolver*& _solver)
{
-#ifdef HAIKU_TARGET_PLATFORM_HAIKU
+#if defined(HAIKU_TARGET_PLATFORM_HAIKU) || __GNUC__ == 2
pthread_once(&sLoadLibsolvSolverAddOnInitOnce,
&load_libsolv_solver_add_on);
#endif
if (sCreateSolver == NULL)
Other related posts:
- » [haiku-commits] BRANCH HaikuPM-github.package-management [4dd0ed4] in src: kits/package/solver build/libsolv - HaikuPM-github . package-management
