Skip to content

C
core
Kaydet (Commit) 49313b06 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Make python3 work with custom VALGRIND_CFLAGS 

Change-Id: Ia4b08a1b20bf46af4d06c0478ed8e795ee543703
üst a0a58556
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 42 deletions
RepositoryExternal.mk
Dosyayı görüntüle @ 49313b06
......@@ -1478,12 +1478,11 @@ endef
endif # SYSTEM_CURL
# strip because of gb_SPACE
ifneq ($(strip $(VALGRIND_CFLAGS)),)
ifeq ($(ENABLE_VALGRIND),TRUE)
define gb_LinkTarget__use_valgrind
$(call gb_LinkTarget_add_defs,$(1),\
-DHAVE_VALGRIND_H \
-DHAVE_MEMCHECK_H \
-DHAVE_VALGRIND_HEADERS \
)
$(call gb_LinkTarget_set_include,$(1),\
......@@ -1493,13 +1492,13 @@ $(call gb_LinkTarget_set_include,$(1),\
endef
else # !VALGRIND_CFLAGS
else # !ENABLE_VALGRIND
define gb_LinkTarget__use_valgrind
endef
endif # VALGRIND_CFLAGS
endif # ENABLE_VALGRIND
ifeq ($(SYSTEM_POPPLER),YES)
......
config_host.mk.in
Dosyayı görüntüle @ 49313b06
......@@ -179,6 +179,7 @@ export ENABLE_SILENT_MSI=@ENABLE_SILENT_MSI@
export ENABLE_SYMBOLS=@ENABLE_SYMBOLS@
export ENABLE_SYSTRAY_GTK=@ENABLE_SYSTRAY_GTK@
export ENABLE_TELEPATHY=@ENABLE_TELEPATHY@
export ENABLE_VALGRIND=@ENABLE_VALGRIND@
export ENABLE_ZENITY=@ENABLE_ZENITY@
export EPM=@EPM@
export EPM_FLAGS=@EPM_FLAGS@
......
configure.ac
Dosyayı görüntüle @ 49313b06
......@@ -5074,25 +5074,21 @@ AC_SUBST(ALIGNOF_LONG)
AC_SUBST(ALIGNOF_DOUBLE)
dnl ===================================================================
dnl Check if valgrind.h is available
dnl Check if valgrind headers are available
dnl ===================================================================
if test "$cross_compiling" != "yes" -a -n "$ENABLE_DBGUTIL" -a \
-z "$VALGRIND_CFLAGS"; then
dnl Test $prefix (currently only testing for /usr and /usr/local)
dnl so that VALGRIND_CFLAGS = -I$prefix/include/valgrind
if test "$cross_compiling" = yes -o "$ENABLE_DBGUTIL" != TRUE; then
ENABLE_VALGRIND=FALSE
else
prev_cppflags=$CPPFLAGS
CPPFLAGS="-I/usr/include/valgrind"
AC_CHECK_HEADER([valgrind.h], [VALGRIND_CFLAGS=$CPPFLAGS], [unset ac_cv_header_valgrind_h])
if test -z "$VALGRIND_CFLAGS"; then
CPPFLAGS="-I/usr/local/include/valgrind"
AC_CHECK_HEADER([valgrind.h], [VALGRIND_CFLAGS=$CPPFLAGS], [])
fi
if test -n "$VALGRIND_CFLAGS"; then
CPPFLAGS=$VALGRIND_CFLAGS
AC_CHECK_HEADER([memcheck.h], [], [VALGRIND_CFLAGS=""])
fi
CPPFLAGS="$CPPFLAGS $VALGRIND_CFLAGS"
AC_CHECK_HEADER([valgrind/valgrind.h],
[ENABLE_VALGRIND=TRUE],[ENABLE_VALGRIND=FALSE])
CPPFLAGS=$prev_cppflags
fi
AC_SUBST([ENABLE_VALGRIND])
if test "$ENABLE_VALGRIND" = FALSE; then
VALGRIND_CFLAGS=
fi
AC_SUBST([VALGRIND_CFLAGS])
dnl ===================================================================
......
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
Dosyayı görüntüle @ 49313b06
......@@ -59,8 +59,8 @@
#include <osl/detail/android-bootstrap.h>
#endif
#if defined HAVE_VALGRIND_H
#include <valgrind.h>
#if defined HAVE_VALGRIND_HEADERS
#include <valgrind/valgrind.h>
#else
#define RUNNING_ON_VALGRIND 0
#endif
......
python3/ExternalProject_python3.mk
Dosyayı görüntüle @ 49313b06
......@@ -53,14 +53,22 @@ else
# create a symlink "LO_lib" because the .so are in a directory with platform
# specific name like build/lib.linux-x86_64-3.3
python3_cflags =
ifeq ($(ENABLE_VALGRIND),TRUE)
python3_cflags += $(VALGRIND_CFLAGS)
endif
ifeq ($(OS),AIX)
python3_cflags += -g0
endif
$(call gb_ExternalProject_get_state_target,python3,build) :
cd $(EXTERNAL_WORKDIR) \
&& ./configure \
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
--with-system-expat \
$(if $(strip $(VALGRIND_CFLAGS)),--with-valgrind) \
$(if $(filter TRUE,$(ENABLE_VALGRIND)),--with-valgrind) \
--prefix=/python-inst \
$(if $(filter AIX,$(OS)),--disable-ipv6 --with-threads CFLAGS="-g0") \
$(if $(filter AIX,$(OS)),--disable-ipv6 --with-threads) \
$(if $(filter WNT-GCC,$(OS)-$(COM)),--with-threads ac_cv_printf_zd_format=no) \
$(if $(filter MACOSX,$(OS)), \
--enable-universalsdk=$(MACOSX_SDK_PATH) --with-universal-archs=32-bit --enable-framework=/@__________________________________________________OOO --with-framework-name=LibreOfficePython, \
......@@ -71,6 +79,7 @@ $(call gb_ExternalProject_get_state_target,python3,build) :
$(if $(filter YES,$(SYSTEM_EXPAT)),, -I$(OUTDIR)/inc/external/expat) \
$(if $(SYSBASE), -I$(SYSBASE)/usr/include) \
)" \
$(if $(python3_cflags),CFLAGS='$(python3_cflags)') \
LDFLAGS="$(strip $(LDFLAGS) \
$(if $(filter YES,$(SYSTEM_OPENSSL)),, -L$(OUTDIR)/lib) \
$(if $(filter YES,$(SYSTEM_EXPAT)),, -L$(OUTDIR)/lib) \
......
sal/osl/unx/signal.c
Dosyayı görüntüle @ 49313b06
......@@ -76,8 +76,8 @@
# define ACT_ABORT ACT_SYSTEM
#endif
#if defined(HAVE_MEMCHECK_H)
#include <memcheck.h>
#if defined HAVE_VALGRIND_HEADERS
#include <valgrind/memcheck.h>
#endif
typedef struct _oslSignalHandlerImpl
......@@ -255,7 +255,7 @@ static sal_Bool InitSignal()
/* Initialize the rest of the signals */
for (i = 0; i < NoSignals; ++i)
{
#if defined(HAVE_MEMCHECK_H)
#if defined HAVE_VALGRIND_HEADERS
if (Signals[i].Signal == SIGUSR2 && RUNNING_ON_VALGRIND)
Signals[i].Action = ACT_IGNORE;
#endif
......@@ -908,7 +908,7 @@ void CallSystemHandler(int Signal)
}
}
#if defined(HAVE_MEMCHECK_H)
#if defined HAVE_VALGRIND_HEADERS
static void DUMPCURRENTALLOCS()
{
VALGRIND_PRINTF( "=== start memcheck dump of active allocations ===\n" );
......@@ -965,7 +965,7 @@ void SignalHandlerFunction(int Signal)
Info.Signal = osl_Signal_Terminate;
break;
#if defined(HAVE_MEMCHECK_H)
#if defined HAVE_VALGRIND_HEADERS
case SIGUSR2:
if (RUNNING_ON_VALGRIND)
DUMPCURRENTALLOCS();
......
sal/workben/makefile.mk
Dosyayı görüntüle @ 49313b06
......@@ -96,8 +96,8 @@ APP4DEPN=$(SLB)$/sal.lib
OBJFILES+=\
$(OBJ)$/measure_oustrings.obj
.IF "$(HAVE_CALLGRIND)" == "YES"
CFLAGSCXX+=-DHAVE_CALLGRIND
.IF "$(ENABLE_VALGRIND)" == "TRUE"
CFLAGSCXX+=-DHAVE_VALGRIND_HEADERS
.ENDIF
APP6TARGET=measure_oustrings
......
sal/workben/measure_oustrings.cxx
Dosyayı görüntüle @ 49313b06
......@@ -36,7 +36,7 @@
#include <sstream>
#include <fstream>
#ifdef HAVE_CALLGRIND
#if defined HAVE_VALGRIND_HEADERS
# include <valgrind/callgrind.h>
int COUNT = 1;
#else
......
vcl/source/gdi/bitmap2.cxx
Dosyayı görüntüle @ 49313b06
......@@ -27,8 +27,8 @@
#include <utility>
#if defined(HAVE_MEMCHECK_H)
#include <memcheck.h>
#if defined HAVE_VALGRIND_HEADERS
#include <valgrind/memcheck.h>
#endif
......@@ -896,7 +896,7 @@ sal_Bool Bitmap::ImplWriteDIBPalette( SvStream& rOStm, BitmapReadAccess& rAcc )
// ------------------------------------------------------------------
#if defined(HAVE_MEMCHECK_H)
#if defined HAVE_VALGRIND_HEADERS
namespace
{
void blankExtraSpace(sal_uInt8 *pBits, long nWidth, long nScanlineSize, int nBitCount)
......@@ -980,7 +980,7 @@ sal_Bool Bitmap::ImplWriteDIBBits( SvStream& rOStm, BitmapReadAccess& rAcc,
const long nWidth = rAcc.Width();
const long nHeight = rAcc.Height();
sal_uInt8* pBuf = new sal_uInt8[ nAlignedWidth ];
#if defined(HAVE_MEMCHECK_H)
#if defined HAVE_VALGRIND_HEADERS
if (RUNNING_ON_VALGRIND)
blankExtraSpace(pBuf, nWidth, nAlignedWidth, discretizeBitcount(nBitCount));
#endif
......
vcl/unx/generic/gdi/salbmp.cxx
Dosyayı görüntüle @ 49313b06
......@@ -43,8 +43,8 @@
#include <unx/salinst.h>
#include <unx/x11/xlimits.hxx>
#if defined(HAVE_MEMCHECK_H)
#include <memcheck.h>
#if defined HAVE_VALGRIND_HEADERS
#include <valgrind/memcheck.h>
#endif
// -------------
......@@ -101,7 +101,7 @@ void X11SalBitmap::ImplRemovedFromCache()
delete mpDDB, mpDDB = NULL;
}
#if defined(HAVE_MEMCHECK_H)
#if defined HAVE_VALGRIND_HEADERS
namespace
{
void blankExtraSpace(BitmapBuffer* pDIB)
......@@ -192,7 +192,7 @@ BitmapBuffer* X11SalBitmap::ImplCreateDIB(
try
{
pDIB->mpBits = new sal_uInt8[ pDIB->mnScanlineSize * pDIB->mnHeight ];
#if defined(HAVE_MEMCHECK_H)
#if defined HAVE_VALGRIND_HEADERS
if (RUNNING_ON_VALGRIND)
blankExtraSpace(pDIB);
#endif
......@@ -540,7 +540,7 @@ XImage* X11SalBitmap::ImplCreateXImage(
if( pDstBuf && pDstBuf->mpBits )
{
#if defined(HAVE_MEMCHECK_H)
#if defined HAVE_VALGRIND_HEADERS
if (RUNNING_ON_VALGRIND)
blankExtraSpace(pDstBuf);
#endif
......@@ -718,7 +718,7 @@ bool X11SalBitmap::Create( const SalBitmap& rSSalBmp )
try
{
mpDIB->mpBits = new sal_uInt8[ mpDIB->mnScanlineSize * mpDIB->mnHeight ];
#if defined(HAVE_MEMCHECK_H)
#if defined HAVE_VALGRIND_HEADERS
if (RUNNING_ON_VALGRIND)
blankExtraSpace(mpDIB);
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment