diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-10-16 21:36:15 +0200 |
---|---|---|
committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2013-10-16 22:16:23 +0000 |
commit | 98404a843198c532c5639b073a3a83ff3529615b (patch) | |
tree | f17139795a0a7a26b4fe32fd40a7abc6fa0653d1 /external | |
parent | 151c55e77185aed554e3db7b92b8ec3e006bbd66 (diff) |
remove glibc stub and tarball, it seems to be completely unused
Change-Id: I1638d4cfc0e6025bd33ed6770ede8556304d6919
Reviewed-on: https://gerrit.libreoffice.org/6278
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'external')
-rw-r--r-- | external/Module_external.mk | 9 | ||||
-rw-r--r-- | external/StaticLibrary_gnu_readdir_r.mk | 28 | ||||
-rw-r--r-- | external/UnpackedTarball_glibc.mk | 19 | ||||
-rw-r--r-- | external/glibc/config.h | 40 | ||||
-rw-r--r-- | external/glibc/readdir_r.c | 54 |
5 files changed, 0 insertions, 150 deletions
diff --git a/external/Module_external.mk b/external/Module_external.mk index 506c03aa517e..538b3fdeaa9c 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -17,15 +17,6 @@ ifeq ($(COM),MSC) $(eval $(call gb_Module_add_moduledir,external,msc-externals)) endif -ifeq ($(HAVE_READDIR_R),NO) -ifneq ($(OS),WNT) -$(eval $(call gb_Module_add_targets,external,\ - UnpackedTarball_glibc \ - StaticLibrary_gnu_readdir_r \ -)) -endif -endif - $(call gb_Helper_optional,LIBPNG,\ $(eval $(call gb_Module_add_moduledir,external,libpng))) diff --git a/external/StaticLibrary_gnu_readdir_r.mk b/external/StaticLibrary_gnu_readdir_r.mk deleted file mode 100644 index 51a618eba73c..000000000000 --- a/external/StaticLibrary_gnu_readdir_r.mk +++ /dev/null @@ -1,28 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_StaticLibrary_StaticLibrary,gnu_readdir_r)) - -$(eval $(call gb_StaticLibrary_use_unpacked,gnu_readdir_r,glibc)) - -$(eval $(call gb_StaticLibrary_set_include,gnu_readdir_r,\ - -I$(call gb_UnpackedTarball_get_dir,glibc) \ - $$(INCLUDE) \ -)) - -$(eval $(call gb_StaticLibrary_add_defs,gnu_readdir_r,\ - -DHAVE_STRING_H \ - -DHAVE_CONFIG_H \ -)) - -$(eval $(call gb_StaticLibrary_add_cobjects,gnu_readdir_r,\ - external/glibc/readdir_r \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/UnpackedTarball_glibc.mk b/external/UnpackedTarball_glibc.mk deleted file mode 100644 index 3921d4da0240..000000000000 --- a/external/UnpackedTarball_glibc.mk +++ /dev/null @@ -1,19 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_UnpackedTarball_UnpackedTarball,glibc)) - -$(eval $(call gb_UnpackedTarball_set_tarball,glibc,$(GLIBC_TARBALL))) - -$(eval $(call gb_UnpackedTarball_add_files,glibc,posix,\ - external/glibc/config.h \ - external/glibc/readdir_r.c \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/external/glibc/config.h b/external/glibc/config.h deleted file mode 100644 index c5df8d89e489..000000000000 --- a/external/glibc/config.h +++ /dev/null @@ -1,40 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifdef WNT -#include <stdlib.h> -#define getenv getenv -#endif - - -#if defined(MACOSX) -//Workaround for MACOS -#define getopt my_neues_getopt -#define opterr my_neues_opterr -#define optind my_neues_optind -#define optopt my_neues_optopt -#endif diff --git a/external/glibc/readdir_r.c b/external/glibc/readdir_r.c deleted file mode 100644 index 87b8c9dc4053..000000000000 --- a/external/glibc/readdir_r.c +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright (C) 1991,92,93,94,95,96,97,98,99,2000 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#include <errno.h> -#include <limits.h> -#include <stddef.h> -#include <string.h> -#include <dirent.h> -#include <unistd.h> -#include <sys/types.h> -#include <assert.h> - -#ifndef __READDIR_R -# define __READDIR_R readdir_r -# define DIRENT_TYPE struct dirent -#endif - -/* Read a directory entry from DIRP. */ -int -__READDIR_R (DIR *dirp, DIRENT_TYPE *entry, DIRENT_TYPE **result) -{ - DIRENT_TYPE *dp; - size_t reclen; - - errno = 0; - /* call our non-reentrant counterpart to get the information */ - dp = readdir(dirp); - - /* copy the result into entry */ - if (dp != NULL) { - reclen = dp->d_reclen; /* This might be NetBSD-specific - * Add #ifdef's if anything else needed */ - *result = memcpy(entry, dp, reclen); - } else { - *result = NULL; - } - - return dp != NULL ? 0 : errno ? errno : 0; -} |