cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

start fixing the regress tests

Browse Source
This commit is contained in:
jasper 2011-10-15 07:38:10 +00:00
parent 688dbb0d49
commit 9460d93a06
3 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
x11/gnome/glom/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-Makefile_in,v 1.1 2011/10/15 07:38:10 jasper Exp $
Remove -dl linking, which won't work on OpenBSD.
--- Makefile.in.orig Sat Oct 15 09:22:55 2011
+++ Makefile.in Sat Oct 15 09:23:05 2011
@@ -2590,7 +2590,7 @@ tests_test_signal_reemit_SOURCES = tests/test_signal_r
tests_test_signal_reemit_LDADD = $(LIBGLOM_LIBS)
tests_test_signal_reemit_CPPFLAGS = $(tests_cppflags)
tests_python_test_load_python_library_SOURCES = tests/python/test_load_python_library.cc
-tests_python_test_load_python_library_LDADD = $(LIBGLOM_LIBS) -ldl
+tests_python_test_load_python_library_LDADD = $(LIBGLOM_LIBS)
tests_python_test_load_python_library_CPPFLAGS = $(tests_cppflags)
tests_python_test_python_module_SOURCES = tests/python/test_python_module.cc
tests_python_test_python_module_LDADD = $(tests_ldadd) $(PYTHON_LIBS)

18
x11/gnome/glom/patches/patch-tests_python_test_load_python_library_cc Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-tests_python_test_load_python_library_cc,v 1.1 2011/10/15 07:38:10 jasper Exp $
From 6cf7305f565b0e06e16bb77a0d53f6f7d8cd5f7d Mon Sep 17 00:00:00 2001
From: Murray Cumming <murrayc@murrayc.com>
Date: Fri, 14 Oct 2011 21:40:31 +0000
Subject: Tests: Fix cast error when using dlerror().
--- tests/python/test_load_python_library.cc.orig Sat Oct 15 09:19:00 2011
+++ tests/python/test_load_python_library.cc Sat Oct 15 09:19:10 2011
@@ -12,7 +12,7 @@ int main()
if(!lib)
{
- char *error = dlerror();
+ const char *error = dlerror();
if(error)
{
fprintf (stderr, "%s\n", error);

30
x11/gnome/glom/patches/patch-tests_python_test_python_module_cc Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-tests_python_test_python_module_cc,v 1.1 2011/10/15 07:38:10 jasper Exp $
From e2e9cf98d420f1bf924a1e416c3b258c28ee2fd4 Mon Sep 17 00:00:00 2001
From: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date: Sat, 15 Oct 2011 09:33:34 +0200
Subject: [PATCH] Hide another __libc_freeres on systems which don't have
glibc.
https://bugzilla.gnome.org/show_bug.cgi?id=660496
--- tests/python/test_python_module.cc.orig Sat Oct 15 09:24:18 2011
+++ tests/python/test_python_module.cc Sat Oct 15 09:25:07 2011
@@ -5,7 +5,7 @@
#include "config.h"
#include "glom/python_embed/glom_python.h"
-#ifndef G_OS_WIN32
+#ifdef __linux__
extern "C" void __libc_freeres(void);
#endif
@@ -43,7 +43,7 @@ bool gda_python_module_is_available()
int main ()
{
-#ifndef G_OS_WIN32
+#ifdef __linux__
atexit(__libc_freeres);
#endif
Glom::libglom_init(); // Calls PyInitialize()