Return-Path: X-Original-To: apmail-incubator-celix-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-celix-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D684C4D2B for ; Fri, 27 May 2011 06:30:01 +0000 (UTC) Received: (qmail 48829 invoked by uid 500); 27 May 2011 06:30:01 -0000 Delivered-To: apmail-incubator-celix-commits-archive@incubator.apache.org Received: (qmail 48804 invoked by uid 500); 27 May 2011 06:30:00 -0000 Mailing-List: contact celix-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: celix-dev@incubator.apache.org Delivered-To: mailing list celix-commits@incubator.apache.org Received: (qmail 48784 invoked by uid 99); 27 May 2011 06:29:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 May 2011 06:29:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 May 2011 06:29:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DD83A238890A; Fri, 27 May 2011 06:29:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1128167 - in /incubator/celix/trunk: framework/private/src/framework.c mongoose/CMakeLists.txt Date: Fri, 27 May 2011 06:29:34 -0000 To: celix-commits@incubator.apache.org From: abroekhuis@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110527062934.DD83A238890A@eris.apache.org> Author: abroekhuis Date: Fri May 27 06:29:34 2011 New Revision: 1128167 URL: http://svn.apache.org/viewvc?rev=1128167&view=rev Log: Some code cleanup and comments Modified: incubator/celix/trunk/framework/private/src/framework.c incubator/celix/trunk/mongoose/CMakeLists.txt Modified: incubator/celix/trunk/framework/private/src/framework.c URL: http://svn.apache.org/viewvc/incubator/celix/trunk/framework/private/src/framework.c?rev=1128167&r1=1128166&r2=1128167&view=diff ============================================================================== --- incubator/celix/trunk/framework/private/src/framework.c (original) +++ incubator/celix/trunk/framework/private/src/framework.c Fri May 27 06:29:34 2011 @@ -446,6 +446,9 @@ celix_status_t fw_startBundle(FRAMEWORK library_extension ); + // BUG: Can't use apr_dso_load, apr assumes RTLD_GLOBAL for loading libraries. +// apr_dso_handle_t *handle; +// apr_dso_load(&handle, libraryPath, bundle->memoryPool); handle = dlopen(libraryPath, RTLD_LAZY|RTLD_LOCAL); if (handle == NULL) { printf ("%s\n", dlerror()); Modified: incubator/celix/trunk/mongoose/CMakeLists.txt URL: http://svn.apache.org/viewvc/incubator/celix/trunk/mongoose/CMakeLists.txt?rev=1128167&r1=1128166&r2=1128167&view=diff ============================================================================== --- incubator/celix/trunk/mongoose/CMakeLists.txt (original) +++ incubator/celix/trunk/mongoose/CMakeLists.txt Fri May 27 06:29:34 2011 @@ -16,7 +16,7 @@ # under the License. add_library(mongoose STATIC mongoose.c) -SET_TARGET_PROPERTIES( mongoose PROPERTIES COMPILE_FLAGS -fPIC) +SET_TARGET_PROPERTIES(mongoose PROPERTIES COMPILE_FLAGS -fPIC) add_library(celix.mongoose SHARED activator) include_directories("${PROJECT_SOURCE_DIR}/utils/public/include")