diff options
| -rw-r--r-- | patches/qpdf-6.0.0.local.patch | 821 | ||||
| -rw-r--r-- | subr/pkg_configure.subr | 1 | ||||
| -rw-r--r-- | subr/pkg_setup_env.subr | 1 | ||||
| -rw-r--r-- | vars/build.vars | 10 |
4 files changed, 831 insertions, 2 deletions
diff --git a/patches/qpdf-6.0.0.local.patch b/patches/qpdf-6.0.0.local.patch new file mode 100644 index 00000000..42ca3c19 --- /dev/null +++ b/patches/qpdf-6.0.0.local.patch @@ -0,0 +1,821 @@ +--- qpdf-6.0.0/configure.orig 2015-11-10 17:50:09.000000000 +0000 ++++ qpdf-6.0.0/configure 2017-02-13 08:55:48.801200499 +0000 +@@ -7746,7 +7746,7 @@ + LIBTOOL_DEPS="$ltmain" + + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++#LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + + +@@ -17748,809 +17748,6 @@ + esac + + +- case $ac_file$ac_mode in +- "libtool":C) +- +- # See if we are running on zsh, and set the options which allow our +- # commands through without removal of \ escapes. +- if test -n "${ZSH_VERSION+set}" ; then +- setopt NO_GLOB_SUBST +- fi +- +- cfgfile="${ofile}T" +- trap "$RM \"$cfgfile\"; exit 1" 1 2 15 +- $RM "$cfgfile" +- +- cat <<_LT_EOF >> "$cfgfile" +-#! $SHELL +- +-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. +-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION +-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: +-# NOTE: Changes made to this file will be lost: look at ltmain.sh. +-# +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, +-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +-# Foundation, Inc. +-# Written by Gordon Matzigkeit, 1996 +-# +-# This file is part of GNU Libtool. +-# +-# GNU Libtool is free software; you can redistribute it and/or +-# modify it under the terms of the GNU General Public License as +-# published by the Free Software Foundation; either version 2 of +-# the License, or (at your option) any later version. +-# +-# As a special exception to the GNU General Public License, +-# if you distribute this file as part of a program or library that +-# is built using GNU Libtool, you may include this file under the +-# same distribution terms that you use for the rest of that program. +-# +-# GNU Libtool 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 General Public License for more details. +-# +-# You should have received a copy of the GNU General Public License +-# along with GNU Libtool; see the file COPYING. If not, a copy +-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or +-# obtained by writing to the Free Software Foundation, Inc., +-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +- +- +-# The names of the tagged configurations supported by this script. +-available_tags="CXX " +- +-# ### BEGIN LIBTOOL CONFIG +- +-# Which release of libtool.m4 was used? +-macro_version=$macro_version +-macro_revision=$macro_revision +- +-# Assembler program. +-AS=$lt_AS +- +-# DLL creation program. +-DLLTOOL=$lt_DLLTOOL +- +-# Object dumper program. +-OBJDUMP=$lt_OBJDUMP +- +-# Whether or not to build shared libraries. +-build_libtool_libs=$enable_shared +- +-# Whether or not to build static libraries. +-build_old_libs=$enable_static +- +-# What type of objects to build. +-pic_mode=$pic_mode +- +-# Whether or not to optimize for fast installation. +-fast_install=$enable_fast_install +- +-# Shell to use when invoking shell scripts. +-SHELL=$lt_SHELL +- +-# An echo program that protects backslashes. +-ECHO=$lt_ECHO +- +-# The PATH separator for the build system. +-PATH_SEPARATOR=$lt_PATH_SEPARATOR +- +-# The host system. +-host_alias=$host_alias +-host=$host +-host_os=$host_os +- +-# The build system. +-build_alias=$build_alias +-build=$build +-build_os=$build_os +- +-# A sed program that does not truncate output. +-SED=$lt_SED +- +-# Sed that helps us avoid accidentally triggering echo(1) options like -n. +-Xsed="\$SED -e 1s/^X//" +- +-# A grep program that handles long lines. +-GREP=$lt_GREP +- +-# An ERE matcher. +-EGREP=$lt_EGREP +- +-# A literal string matcher. +-FGREP=$lt_FGREP +- +-# A BSD- or MS-compatible name lister. +-NM=$lt_NM +- +-# Whether we need soft or hard links. +-LN_S=$lt_LN_S +- +-# What is the maximum length of a command? +-max_cmd_len=$max_cmd_len +- +-# Object file suffix (normally "o"). +-objext=$ac_objext +- +-# Executable file suffix (normally ""). +-exeext=$exeext +- +-# whether the shell understands "unset". +-lt_unset=$lt_unset +- +-# turn spaces into newlines. +-SP2NL=$lt_lt_SP2NL +- +-# turn newlines into spaces. +-NL2SP=$lt_lt_NL2SP +- +-# convert \$build file names to \$host format. +-to_host_file_cmd=$lt_cv_to_host_file_cmd +- +-# convert \$build files to toolchain format. +-to_tool_file_cmd=$lt_cv_to_tool_file_cmd +- +-# Method to check whether dependent libraries are shared objects. +-deplibs_check_method=$lt_deplibs_check_method +- +-# Command to use when deplibs_check_method = "file_magic". +-file_magic_cmd=$lt_file_magic_cmd +- +-# How to find potential files when deplibs_check_method = "file_magic". +-file_magic_glob=$lt_file_magic_glob +- +-# Find potential files using nocaseglob when deplibs_check_method = "file_magic". +-want_nocaseglob=$lt_want_nocaseglob +- +-# Command to associate shared and link libraries. +-sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd +- +-# The archiver. +-AR=$lt_AR +- +-# Flags to create an archive. +-AR_FLAGS=$lt_AR_FLAGS +- +-# How to feed a file listing to the archiver. +-archiver_list_spec=$lt_archiver_list_spec +- +-# A symbol stripping program. +-STRIP=$lt_STRIP +- +-# Commands used to install an old-style archive. +-RANLIB=$lt_RANLIB +-old_postinstall_cmds=$lt_old_postinstall_cmds +-old_postuninstall_cmds=$lt_old_postuninstall_cmds +- +-# Whether to use a lock for old archive extraction. +-lock_old_archive_extraction=$lock_old_archive_extraction +- +-# A C compiler. +-LTCC=$lt_CC +- +-# LTCC compiler flags. +-LTCFLAGS=$lt_CFLAGS +- +-# Take the output of nm and produce a listing of raw symbols and C names. +-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe +- +-# Transform the output of nm in a proper C declaration. +-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl +- +-# Transform the output of nm in a C name address pair. +-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address +- +-# Transform the output of nm in a C name address pair when lib prefix is needed. +-global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix +- +-# Specify filename containing input files for \$NM. +-nm_file_list_spec=$lt_nm_file_list_spec +- +-# The root where to search for dependent libraries,and in which our libraries should be installed. +-lt_sysroot=$lt_sysroot +- +-# The name of the directory that contains temporary libtool files. +-objdir=$objdir +- +-# Used to examine libraries when file_magic_cmd begins with "file". +-MAGIC_CMD=$MAGIC_CMD +- +-# Must we lock files when doing compilation? +-need_locks=$lt_need_locks +- +-# Manifest tool. +-MANIFEST_TOOL=$lt_MANIFEST_TOOL +- +-# Tool to manipulate archived DWARF debug symbol files on Mac OS X. +-DSYMUTIL=$lt_DSYMUTIL +- +-# Tool to change global to local symbols on Mac OS X. +-NMEDIT=$lt_NMEDIT +- +-# Tool to manipulate fat objects and archives on Mac OS X. +-LIPO=$lt_LIPO +- +-# ldd/readelf like tool for Mach-O binaries on Mac OS X. +-OTOOL=$lt_OTOOL +- +-# ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. +-OTOOL64=$lt_OTOOL64 +- +-# Old archive suffix (normally "a"). +-libext=$libext +- +-# Shared library suffix (normally ".so"). +-shrext_cmds=$lt_shrext_cmds +- +-# The commands to extract the exported symbol list from a shared archive. +-extract_expsyms_cmds=$lt_extract_expsyms_cmds +- +-# Variables whose values should be saved in libtool wrapper scripts and +-# restored at link time. +-variables_saved_for_relink=$lt_variables_saved_for_relink +- +-# Do we need the "lib" prefix for modules? +-need_lib_prefix=$need_lib_prefix +- +-# Do we need a version for libraries? +-need_version=$need_version +- +-# Library versioning type. +-version_type=$version_type +- +-# Shared library runtime path variable. +-runpath_var=$runpath_var +- +-# Shared library path variable. +-shlibpath_var=$shlibpath_var +- +-# Is shlibpath searched before the hard-coded library search path? +-shlibpath_overrides_runpath=$shlibpath_overrides_runpath +- +-# Format of library name prefix. +-libname_spec=$lt_libname_spec +- +-# List of archive names. First name is the real one, the rest are links. +-# The last name is the one that the linker finds with -lNAME +-library_names_spec=$lt_library_names_spec +- +-# The coded name of the library, if different from the real name. +-soname_spec=$lt_soname_spec +- +-# Permission mode override for installation of shared libraries. +-install_override_mode=$lt_install_override_mode +- +-# Command to use after installation of a shared archive. +-postinstall_cmds=$lt_postinstall_cmds +- +-# Command to use after uninstallation of a shared archive. +-postuninstall_cmds=$lt_postuninstall_cmds +- +-# Commands used to finish a libtool library installation in a directory. +-finish_cmds=$lt_finish_cmds +- +-# As "finish_cmds", except a single script fragment to be evaled but +-# not shown. +-finish_eval=$lt_finish_eval +- +-# Whether we should hardcode library paths into libraries. +-hardcode_into_libs=$hardcode_into_libs +- +-# Compile-time system search path for libraries. +-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec +- +-# Run-time system search path for libraries. +-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec +- +-# Whether dlopen is supported. +-dlopen_support=$enable_dlopen +- +-# Whether dlopen of programs is supported. +-dlopen_self=$enable_dlopen_self +- +-# Whether dlopen of statically linked programs is supported. +-dlopen_self_static=$enable_dlopen_self_static +- +-# Commands to strip libraries. +-old_striplib=$lt_old_striplib +-striplib=$lt_striplib +- +- +-# The linker used to build libraries. +-LD=$lt_LD +- +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag +-reload_cmds=$lt_reload_cmds +- +-# Commands used to build an old-style archive. +-old_archive_cmds=$lt_old_archive_cmds +- +-# A language specific compiler. +-CC=$lt_compiler +- +-# Is the compiler the GNU compiler? +-with_gcc=$GCC +- +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag +- +-# Additional compiler flags for building library objects. +-pic_flag=$lt_lt_prog_compiler_pic +- +-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl +- +-# Compiler flag to prevent dynamic linking. +-link_static_flag=$lt_lt_prog_compiler_static +- +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_lt_cv_prog_compiler_c_o +- +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$archive_cmds_need_lc +- +-# Whether or not to disallow shared libs when runtime libs are static. +-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes +- +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec +- +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_whole_archive_flag_spec +- +-# Whether the compiler copes with passing no objects directly. +-compiler_needs_object=$lt_compiler_needs_object +- +-# Create an old-style archive from a shared archive. +-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds +- +-# Create a temporary old-style archive to link instead of a shared archive. +-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds +- +-# Commands used to build a shared archive. +-archive_cmds=$lt_archive_cmds +-archive_expsym_cmds=$lt_archive_expsym_cmds +- +-# Commands used to build a loadable module if different from building +-# a shared archive. +-module_cmds=$lt_module_cmds +-module_expsym_cmds=$lt_module_expsym_cmds +- +-# Whether we are building with GNU ld or not. +-with_gnu_ld=$lt_with_gnu_ld +- +-# Flag that allows shared libraries with undefined symbols to be built. +-allow_undefined_flag=$lt_allow_undefined_flag +- +-# Flag that enforces no undefined symbols. +-no_undefined_flag=$lt_no_undefined_flag +- +-# Flag to hardcode \$libdir into a binary during linking. +-# This must work even if \$libdir does not exist +-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec +- +-# Whether we need a single "-rpath" flag with a separated argument. +-hardcode_libdir_separator=$lt_hardcode_libdir_separator +- +-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +-# DIR into the resulting binary. +-hardcode_direct=$hardcode_direct +- +-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +-# DIR into the resulting binary and the resulting library dependency is +-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +-# library is relocated. +-hardcode_direct_absolute=$hardcode_direct_absolute +- +-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR +-# into the resulting binary. +-hardcode_minus_L=$hardcode_minus_L +- +-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR +-# into the resulting binary. +-hardcode_shlibpath_var=$hardcode_shlibpath_var +- +-# Set to "yes" if building a shared library automatically hardcodes DIR +-# into the library and all subsequent libraries and executables linked +-# against it. +-hardcode_automatic=$hardcode_automatic +- +-# Set to yes if linker adds runtime paths of dependent libraries +-# to runtime path list. +-inherit_rpath=$inherit_rpath +- +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$link_all_deplibs +- +-# Set to "yes" if exported symbols are required. +-always_export_symbols=$always_export_symbols +- +-# The commands to list exported symbols. +-export_symbols_cmds=$lt_export_symbols_cmds +- +-# Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_exclude_expsyms +- +-# Symbols that must always be exported. +-include_expsyms=$lt_include_expsyms +- +-# Commands necessary for linking programs (against libraries) with templates. +-prelink_cmds=$lt_prelink_cmds +- +-# Commands necessary for finishing linking programs. +-postlink_cmds=$lt_postlink_cmds +- +-# Specify filename containing input files. +-file_list_spec=$lt_file_list_spec +- +-# How to hardcode a shared library path into an executable. +-hardcode_action=$hardcode_action +- +-# The directories searched by this compiler when creating a shared library. +-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs +- +-# Dependencies to place before and after the objects being linked to +-# create a shared library. +-predep_objects=$lt_predep_objects +-postdep_objects=$lt_postdep_objects +-predeps=$lt_predeps +-postdeps=$lt_postdeps +- +-# The library search path used internally by the compiler when linking +-# a shared library. +-compiler_lib_search_path=$lt_compiler_lib_search_path +- +-# ### END LIBTOOL CONFIG +- +-_LT_EOF +- +- case $host_os in +- aix3*) +- cat <<\_LT_EOF >> "$cfgfile" +-# AIX sometimes has problems with the GCC collect2 program. For some +-# reason, if we set the COLLECT_NAMES environment variable, the problems +-# vanish in a puff of smoke. +-if test "X${COLLECT_NAMES+set}" != Xset; then +- COLLECT_NAMES= +- export COLLECT_NAMES +-fi +-_LT_EOF +- ;; +- esac +- +- +-ltmain="$ac_aux_dir/ltmain.sh" +- +- +- # We use sed instead of cat because bash on DJGPP gets confused if +- # if finds mixed CR/LF and LF-only lines. Since sed operates in +- # text mode, it properly converts lines to CR/LF. This bash problem +- # is reportedly fixed, but why not run on old versions too? +- sed '$q' "$ltmain" >> "$cfgfile" \ +- || (rm -f "$cfgfile"; exit 1) +- +- if test x"$xsi_shell" = xyes; then +- sed -e '/^func_dirname ()$/,/^} # func_dirname /c\ +-func_dirname ()\ +-{\ +-\ case ${1} in\ +-\ */*) func_dirname_result="${1%/*}${2}" ;;\ +-\ * ) func_dirname_result="${3}" ;;\ +-\ esac\ +-} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +- +- sed -e '/^func_basename ()$/,/^} # func_basename /c\ +-func_basename ()\ +-{\ +-\ func_basename_result="${1##*/}"\ +-} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +- +- sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\ +-func_dirname_and_basename ()\ +-{\ +-\ case ${1} in\ +-\ */*) func_dirname_result="${1%/*}${2}" ;;\ +-\ * ) func_dirname_result="${3}" ;;\ +-\ esac\ +-\ func_basename_result="${1##*/}"\ +-} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +- +- sed -e '/^func_stripname ()$/,/^} # func_stripname /c\ +-func_stripname ()\ +-{\ +-\ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\ +-\ # positional parameters, so assign one to ordinary parameter first.\ +-\ func_stripname_result=${3}\ +-\ func_stripname_result=${func_stripname_result#"${1}"}\ +-\ func_stripname_result=${func_stripname_result%"${2}"}\ +-} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +- +- sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\ +-func_split_long_opt ()\ +-{\ +-\ func_split_long_opt_name=${1%%=*}\ +-\ func_split_long_opt_arg=${1#*=}\ +-} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +- +- sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\ +-func_split_short_opt ()\ +-{\ +-\ func_split_short_opt_arg=${1#??}\ +-\ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\ +-} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +- +- sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\ +-func_lo2o ()\ +-{\ +-\ case ${1} in\ +-\ *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\ +-\ *) func_lo2o_result=${1} ;;\ +-\ esac\ +-} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +- +- sed -e '/^func_xform ()$/,/^} # func_xform /c\ +-func_xform ()\ +-{\ +- func_xform_result=${1%.*}.lo\ +-} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +- +- sed -e '/^func_arith ()$/,/^} # func_arith /c\ +-func_arith ()\ +-{\ +- func_arith_result=$(( $* ))\ +-} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +- +- sed -e '/^func_len ()$/,/^} # func_len /c\ +-func_len ()\ +-{\ +- func_len_result=${#1}\ +-} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +-fi +- +-if test x"$lt_shell_append" = xyes; then +- sed -e '/^func_append ()$/,/^} # func_append /c\ +-func_append ()\ +-{\ +- eval "${1}+=\\${2}"\ +-} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +- +- sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\ +-func_append_quoted ()\ +-{\ +-\ func_quote_for_eval "${2}"\ +-\ eval "${1}+=\\\\ \\$func_quote_for_eval_result"\ +-} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +-test 0 -eq $? || _lt_function_replace_fail=: +- +- +- # Save a `func_append' function call where possible by direct use of '+=' +- sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +- test 0 -eq $? || _lt_function_replace_fail=: +-else +- # Save a `func_append' function call even when '+=' is not available +- sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \ +- && mv -f "$cfgfile.tmp" "$cfgfile" \ +- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp") +- test 0 -eq $? || _lt_function_replace_fail=: +-fi +- +-if test x"$_lt_function_replace_fail" = x":"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5 +-$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;} +-fi +- +- +- mv -f "$cfgfile" "$ofile" || +- (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") +- chmod +x "$ofile" +- +- +- cat <<_LT_EOF >> "$ofile" +- +-# ### BEGIN LIBTOOL TAG CONFIG: CXX +- +-# The linker used to build libraries. +-LD=$lt_LD_CXX +- +-# How to create reloadable object files. +-reload_flag=$lt_reload_flag_CXX +-reload_cmds=$lt_reload_cmds_CXX +- +-# Commands used to build an old-style archive. +-old_archive_cmds=$lt_old_archive_cmds_CXX +- +-# A language specific compiler. +-CC=$lt_compiler_CXX +- +-# Is the compiler the GNU compiler? +-with_gcc=$GCC_CXX +- +-# Compiler flag to turn off builtin functions. +-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX +- +-# Additional compiler flags for building library objects. +-pic_flag=$lt_lt_prog_compiler_pic_CXX +- +-# How to pass a linker flag through the compiler. +-wl=$lt_lt_prog_compiler_wl_CXX +- +-# Compiler flag to prevent dynamic linking. +-link_static_flag=$lt_lt_prog_compiler_static_CXX +- +-# Does compiler simultaneously support -c and -o options? +-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX +- +-# Whether or not to add -lc for building shared libraries. +-build_libtool_need_lc=$archive_cmds_need_lc_CXX +- +-# Whether or not to disallow shared libs when runtime libs are static. +-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX +- +-# Compiler flag to allow reflexive dlopens. +-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX +- +-# Compiler flag to generate shared objects directly from archives. +-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX +- +-# Whether the compiler copes with passing no objects directly. +-compiler_needs_object=$lt_compiler_needs_object_CXX +- +-# Create an old-style archive from a shared archive. +-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX +- +-# Create a temporary old-style archive to link instead of a shared archive. +-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX +- +-# Commands used to build a shared archive. +-archive_cmds=$lt_archive_cmds_CXX +-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX +- +-# Commands used to build a loadable module if different from building +-# a shared archive. +-module_cmds=$lt_module_cmds_CXX +-module_expsym_cmds=$lt_module_expsym_cmds_CXX +- +-# Whether we are building with GNU ld or not. +-with_gnu_ld=$lt_with_gnu_ld_CXX +- +-# Flag that allows shared libraries with undefined symbols to be built. +-allow_undefined_flag=$lt_allow_undefined_flag_CXX +- +-# Flag that enforces no undefined symbols. +-no_undefined_flag=$lt_no_undefined_flag_CXX +- +-# Flag to hardcode \$libdir into a binary during linking. +-# This must work even if \$libdir does not exist +-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX +- +-# Whether we need a single "-rpath" flag with a separated argument. +-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX +- +-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +-# DIR into the resulting binary. +-hardcode_direct=$hardcode_direct_CXX +- +-# Set to "yes" if using DIR/libNAME\${shared_ext} during linking hardcodes +-# DIR into the resulting binary and the resulting library dependency is +-# "absolute",i.e impossible to change by setting \${shlibpath_var} if the +-# library is relocated. +-hardcode_direct_absolute=$hardcode_direct_absolute_CXX +- +-# Set to "yes" if using the -LDIR flag during linking hardcodes DIR +-# into the resulting binary. +-hardcode_minus_L=$hardcode_minus_L_CXX +- +-# Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR +-# into the resulting binary. +-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX +- +-# Set to "yes" if building a shared library automatically hardcodes DIR +-# into the library and all subsequent libraries and executables linked +-# against it. +-hardcode_automatic=$hardcode_automatic_CXX +- +-# Set to yes if linker adds runtime paths of dependent libraries +-# to runtime path list. +-inherit_rpath=$inherit_rpath_CXX +- +-# Whether libtool must link a program against all its dependency libraries. +-link_all_deplibs=$link_all_deplibs_CXX +- +-# Set to "yes" if exported symbols are required. +-always_export_symbols=$always_export_symbols_CXX +- +-# The commands to list exported symbols. +-export_symbols_cmds=$lt_export_symbols_cmds_CXX +- +-# Symbols that should not be listed in the preloaded symbols. +-exclude_expsyms=$lt_exclude_expsyms_CXX +- +-# Symbols that must always be exported. +-include_expsyms=$lt_include_expsyms_CXX +- +-# Commands necessary for linking programs (against libraries) with templates. +-prelink_cmds=$lt_prelink_cmds_CXX +- +-# Commands necessary for finishing linking programs. +-postlink_cmds=$lt_postlink_cmds_CXX +- +-# Specify filename containing input files. +-file_list_spec=$lt_file_list_spec_CXX +- +-# How to hardcode a shared library path into an executable. +-hardcode_action=$hardcode_action_CXX +- +-# The directories searched by this compiler when creating a shared library. +-compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX +- +-# Dependencies to place before and after the objects being linked to +-# create a shared library. +-predep_objects=$lt_predep_objects_CXX +-postdep_objects=$lt_postdep_objects_CXX +-predeps=$lt_predeps_CXX +-postdeps=$lt_postdeps_CXX +- +-# The library search path used internally by the compiler when linking +-# a shared library. +-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX +- +-# ### END LIBTOOL TAG CONFIG: CXX +-_LT_EOF +- +- ;; +- +- esac + done # for ac_tag + + diff --git a/subr/pkg_configure.subr b/subr/pkg_configure.subr index f876e1e3..d63b16e6 100644 --- a/subr/pkg_configure.subr +++ b/subr/pkg_configure.subr @@ -10,6 +10,7 @@ pkg_configure() { fi; if [ -x "${PKG_CONFIGURE}" ]; then CFLAGS="${PKG_CFLAGS_CONFIGURE}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}" \ + CPPFLAGS="${PKG_CFLAGS_CONFIGURE}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}" \ CXXFLAGS="${PKG_CXXFLAGS_CONFIGURE}${PKG_CXXFLAGS_CONFIGURE_EXTRA:+ ${PKG_CXXFLAGS_CONFIGURE_EXTRA}}" \ LDFLAGS="${PKG_LDFLAGS_CONFIGURE}${PKG_LDFLAGS_CONFIGURE_EXTRA:+ ${PKG_LDFLAGS_CONFIGURE_EXTRA}}" \ ${PKG_CONFIGURE} \ diff --git a/subr/pkg_setup_env.subr b/subr/pkg_setup_env.subr index fb7b4566..75bf5f96 100644 --- a/subr/pkg_setup_env.subr +++ b/subr/pkg_setup_env.subr @@ -40,6 +40,7 @@ pkg_setup_env() { export RANLIB="${PKG_TARGET}-ranlib"; fi; if [ "${PKG_SLIBTOOL}" != "default" ]; then + export LIBTOOL="${PKG_SLIBTOOL:-slibtool}"; export MAKE="make LIBTOOL=${PKG_SLIBTOOL:-slibtool}"; fi; fi; diff --git a/vars/build.vars b/vars/build.vars index b01bb139..ae2b267f 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -502,8 +502,8 @@ LEAF_PACKAGES_PACKAGES=" apk_tools bash bc bdwgc bind chicken clang_host coreutils cparser cron dash datamash diffutils dos2unix ed figlet file findutils gawk git gnupg grep hexcurse htop inetutils infounzip infozip irssi john ldns less lighttpd lynx make man_db mc mksh nano netcat nginx openlitespeed openssh -p7zip pacman patch perl procps_ng python3 rsync rxvt_unicode sed smallbasic tar tcsh the_silver_searcher -tmux util_linux vim weechat wget which whois xeyes xwd zsh"; +p7zip pacman patch perl procps_ng python3 qpdf rsync rxvt_unicode sed smallbasic tar tcsh +the_silver_searcher tmux util_linux vim weechat wget which whois xeyes xwd zsh"; LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_APK_TOOLS_SHA256SUM:=def2b2c23cd12fd2a9c19be49653b0d1bf9d81a26dac5a0ee79a1351d674f93b}; : ${PKG_APK_TOOLS_VERSION:=2.6.8}; @@ -761,6 +761,12 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}"; : ${PKG_PYTHON3_ENV_VARS_EXTRA:="BLDSHARED=${TARGET}-gcc -shared -mout-implib --sysroot=${PREFIX_NATIVE}:CC=${TARGET}-gcc:CFLAGS=--sysroot=${PREFIX_NATIVE}:CPPFLAGS=--sysroot=${PREFIX_NATIVE}:LDFLAGS=-L${PREFIX_NATIVE}/lib"}: : ${PKG_PYTHON3_MAKEFLAGS_INSTALL_EXTRA:=prefix=}; : ${PKG_PYTHON3_SUBDIR:=Python-${PKG_PYTHON3_VERSION}}; +: ${PKG_QPDF_SHA256SUM:=a9fdc7e94d38fcd3831f37b6e0fe36492bf79aa6d54f8f66062cf7f9c4155233}; +: ${PKG_QPDF_VERSION:=6.0.0}; +: ${PKG_QPDF_URL:=http://ftp.osuosl.org/pub/blfs/svn/q/qpdf-${PKG_QPDF_VERSION}.tar.gz}; +: ${PKG_QPDF_SUBDIR:=qpdf-${PKG_QPDF_VERSION}}; +: ${PKG_QPDF_BUILD_DIR:=${PKG_QPDF_SUBDIR}}; +: ${PKG_QPDF_CONFIGURE_ARGS_EXTRA:=--with-random=/dev/urandom}; : ${PKG_RSYNC_SHA256SUM:=ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2}; : ${PKG_RSYNC_VERSION:=3.1.2}; : ${PKG_RSYNC_URL:=https://download.samba.org/pub/rsync/src/rsync-${PKG_RSYNC_VERSION}.tar.gz}; |