[Libreoffice-commits] core.git: config_host.mk.in configure.ac download.lst external/glibc external/Module_external.mk external/StaticLibrary_gnu_readdir_r.mk external/UnpackedTarball_glibc.mk Makefile.fetch
Bjoern Michaelsen
bjoern.michaelsen at canonical.com
Wed Oct 16 15:16:42 PDT 2013
Makefile.fetch | 1
config_host.mk.in | 2 -
configure.ac | 17 ----------
download.lst | 1
external/Module_external.mk | 9 -----
external/StaticLibrary_gnu_readdir_r.mk | 28 ----------------
external/UnpackedTarball_glibc.mk | 19 -----------
external/glibc/config.h | 40 -----------------------
external/glibc/readdir_r.c | 54 --------------------------------
9 files changed, 171 deletions(-)
New commits:
commit 98404a843198c532c5639b073a3a83ff3529615b
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Wed Oct 16 21:36:15 2013 +0200
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 at libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
diff --git a/Makefile.fetch b/Makefile.fetch
index dbfcc5d..61dfe6c 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -112,7 +112,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)
$(call fetch_Optional,FREETYPE,$(FREETYPE_TARBALL)) \
$(GOOGLE_DOCS_EXTENSION_PACK) \
$(call fetch_Optional,GRAPHITE,$(GRAPHITE_TARBALL)) \
- $(call fetch_Optional,GLIBC,$(GLIBC_TARBALL)) \
$(call fetch_Optional,HSQLDB,$(HSQLDB_TARBALL)) \
$(call fetch_Optional,HUNSPELL,$(HUNSPELL_TARBALL)) \
$(call fetch_Optional,HYPHEN,$(HYPHEN_TARBALL)) \
diff --git a/config_host.mk.in b/config_host.mk.in
index c282770..aba2735 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -237,7 +237,6 @@ export HAVE_LD_BSYMBOLIC_FUNCTIONS=@HAVE_LD_BSYMBOLIC_FUNCTIONS@
export HAVE_LD_HASH_STYLE=@HAVE_LD_HASH_STYLE@
export HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION=@HAVE_NON_CONST_NPP_GETMIMEDESCRIPTION@
export HAVE_POSIX_FALLOCATE=@HAVE_POSIX_FALLOCATE@
-export HAVE_READDIR_R=@HAVE_READDIR_R@
export HAVE_THREADSAFE_STATICS=@HAVE_THREADSAFE_STATICS@
export HELP_COMMON_ONLY=@HELP_COMMON_ONLY@
export HOST_PLATFORM=@host@
@@ -508,7 +507,6 @@ export SYSTEM_ICU=@SYSTEM_ICU@
export SYSTEM_JFREEREPORT=@SYSTEM_JFREEREPORT@
export SYSTEM_JPEG=@SYSTEM_JPEG@
export SYSTEM_LCMS2=@SYSTEM_LCMS2@
-export SYSTEM_LIBC=@SYSTEM_LIBC@
export SYSTEM_CDR=@SYSTEM_CDR@
export SYSTEM_CMIS=@SYSTEM_CMIS@
export SYSTEM_LIBATOMIC_OPS=@SYSTEM_LIBATOMIC_OPS@
diff --git a/configure.ac b/configure.ac
index ca581e3..00419d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9508,23 +9508,6 @@ if test "$_os" = "Linux"; then
fi
fi
-if test "$_os" != "WINNT"; then
- AC_CHECK_FUNCS(readdir_r, HAVE_READDIR_R=YES, [HAVE_READDIR_R=NO])
- if test "$HAVE_READDIR_R" = "YES"; then
- SYSTEM_LIBC=YES
- fi
-else
- HAVE_READDIR_R=NO
- SYSTEM_LIBC=YES
-fi
-
-if test "$HAVE_READDIR_R" = NO; then
- BUILD_TYPE="$BUILD_TYPE GLIBC"
-fi
-
-AC_SUBST(HAVE_READDIR_R)
-AC_SUBST(SYSTEM_LIBC)
-
dnl =========================================
dnl Check for the Windows SDK.
dnl =========================================
diff --git a/download.lst b/download.lst
index 2cb9371..120ac9b 100644
--- a/download.lst
+++ b/download.lst
@@ -43,7 +43,6 @@ export FONT_SOURCECODE_TARBALL := 0279a21fab6f245e85a6f85fea54f511-source-code-f
export FONT_SOURCESANS_TARBALL := 1e9ddfe25ac9577da709d7b2ea36f939-source-sans-font-1.036.tar.gz
export FREETYPE_TARBALL := dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2
export GRAPHITE_TARBALL := 7042305e4208af4c2d5249d814ccce58-graphite2-1.2.3.tgz
-export GLIBC_TARBALL := 4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz
export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
export HUNSPELL_TARBALL := 3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
export HYPHEN_TARBALL := a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 506c03a..538b3fd 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 51a618e..0000000
--- 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 3921d4d..0000000
--- 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 c5df8d8..0000000
--- 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 87b8c9d..0000000
--- 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;
-}
More information about the Libreoffice-commits
mailing list