Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 397424 Details for
Bug 541260
dev-libs/ann - a library for approximate nearest neighbor searching
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for generating the autools based build chain
ann-1.1.2-autools.patch (text/plain), 16.94 KB, created by
Alexander Hewer
on 2015-02-24 16:54:26 UTC
(
hide
)
Description:
Patch for generating the autools based build chain
Filename:
MIME Type:
Creator:
Alexander Hewer
Created:
2015-02-24 16:54:26 UTC
Size:
16.94 KB
patch
obsolete
>diff -rupN original/ANN.pc.in autotools/ANN.pc.in >--- original/ANN.pc.in 1970-01-01 01:00:00.000000000 +0100 >+++ autotools/ANN.pc.in 2015-02-09 09:54:31.562499011 +0100 >@@ -0,0 +1,11 @@ >+prefix=@prefix@ >+exec_prefix=@exec_prefix@ >+libdir=@libdir@ >+includedir=@includedir@ >+ >+Name: ANN >+Description: A Library for Approximate Nearest Neighbor Searching >+Version: 1.1.2 >+URL: http://www.cs.umd.edu/~mount/ANN/ >+Cflags: -I${includedir} >+Libs: -L${libdir} -lANN >diff -rupN original/configure.ac autotools/configure.ac >--- original/configure.ac 1970-01-01 01:00:00.000000000 +0100 >+++ autotools/configure.ac 2015-02-07 18:38:44.449787312 +0100 >@@ -0,0 +1,20 @@ >+AC_INIT([libANN], [1.1.2]) >+AC_CONFIG_MACRO_DIR([m4]) >+AC_CONFIG_SRCDIR([src]) >+AC_CONFIG_AUX_DIR([build-aux]) >+AM_INIT_AUTOMAKE([foreign -Wall]) >+ >+AM_PROG_AR >+AC_PROG_CXX >+AC_PROG_INSTALL >+LT_INIT >+ >+AC_CONFIG_HEADERS([config.h]) >+AC_CONFIG_FILES([ >+ Makefile >+ include/Makefile >+ src/Makefile >+ ANN.pc >+ ]) >+ >+AC_OUTPUT >diff -rupN original/include/Makefile.am autotools/include/Makefile.am >--- original/include/Makefile.am 1970-01-01 01:00:00.000000000 +0100 >+++ autotools/include/Makefile.am 2015-02-03 14:35:01.350874258 +0100 >@@ -0,0 +1,4 @@ >+annincludedir = $(includedir)/ANN >+nodist_anninclude_HEADERS = ANN/ANN.h \ >+ ANN/ANNperf.h \ >+ ANN/ANNx.h >diff -rupN original/Make-config autotools/Make-config >--- original/Make-config 2010-01-28 05:40:01.000000000 +0100 >+++ autotools/Make-config 1970-01-01 01:00:00.000000000 +0100 >@@ -1,194 +0,0 @@ >-#----------------------------------------------------------------------- >-# Makefile variations depending on different configurations >-# >-# ANN: Approximate Nearest Neighbors >-# Version: 1.1 05/03/05 >-# >-# (This Make-config structure is based on the one used by Mesa by Brian >-# Paul. If you succeed in porting ANN to your favorite system, please >-# send email to mount@cs.umd.edu, and I'll try to include it in this >-# list.) >-# >-#---------------------------------------------------------------------- >-# The following configuration-dependent variables are passed to each >-# the Makefile in subdirectories: >-# >-# ANNLIB The name of the ANN library file (usually libANN.a) >-# C++ The C compiler (usually CC or g++) >-# MAKELIB The command and flags to make a library file (usually >-# "ar ...") >-# CFLAGS Flags to C++ compiler >-# RANLIB For "ranlib" = use ranlib, "true" = don't use ranlib >-#---------------------------------------------------------------------- >-# Revision 0.1 09/06/97 >-# Initial release >-# Revision 0.2 06/24/98 >-# Minor changes to fix compilation errors on SGI systems. >-# Revision 1.0 04/01/05 >-# Modifications for alpha with cxx >-# Removed CFLAGS2 options (just write your own) >-# Removed -DUSING... (Compilers are pretty consistent these days) >-# Added linux-g++ target >-# Revision 1.1 05/03/05 >-# Added macosx-g++ target >-#----------------------------------------------------------------------------- >- >-#----------------------------------------------------------------------------- >-# Compilation options (add these, as desired, to the CFLAGS variable >-# in the desired compilation target below). For example, >-# >-# "CFLAGS = -O3 -Wall -DANN_PERF" >-# >-# -g Debugging. >-# -O? Run-time optimization. >-# -Wall Be verbose about warnings. >-# >-# -DANN_PERF Enable performance evaluation. (This may slow execution >-# slightly.) >-# >-# -DANN_NO_LIMITS_H >-# Use this if limits.h or float.h does not exist on your >-# system. (Also see include/ANN/ANN.h for other changes >-# needed.) >-# >-# -DANN_NO_RANDOM >-# Use this option if srandom()/random() are not available >-# on your system. Pseudo-random number generation is used >-# in the utility program test/ann_test. The combination >-# srandom()/random() is considered the best pseudo-random >-# number generator, but is not available on all systems. >-# If they are not available on your system (for example, >-# Visual C++) then srand()/rand() will be used instead by >-# setting this parameter. >-# >-# -DWIN32 >-# This is used only for compilation under windows systems >-# (but instead of using this, use the various .vcproj >-# files in the MS_WIN32 directory). >-#----------------------------------------------------------------------------- >- >-# Linux using g++ >-linux-g++: >- $(MAKE) targets \ >- "ANNLIB = libANN.a" \ >- "C++ = g++" \ >- "CFLAGS = -O3" \ >- "MAKELIB = ar ruv" \ >- "RANLIB = true" >- >-# Mac OS X using g++ >-macosx-g++: >- $(MAKE) targets \ >- "ANNLIB = libANN.a" \ >- "C++ = g++" \ >- "CFLAGS = -O3" \ >- "MAKELIB = libtool -static -o " \ >- "RANLIB = true" >- >-# SunOS5 >-sunos5: >- $(MAKE) targets \ >- "ANNLIB = libANN.a" \ >- "C++ = CC" \ >- "CFLAGS = -O" \ >- "MAKELIB = ar ruv" \ >- "RANLIB = true" >- >-# SunOS5 with shared libraries >-sunos5-sl: >- $(MAKE) targets \ >- "ANNLIB = libANN.a" \ >- "C++ = CC" \ >- "CFLAGS = -Kpic -O" \ >- "MAKELIB = ld -G -o" \ >- "RANLIB = true" >- >-# SunOS5 with g++ >-sunos5-g++: >- $(MAKE) targets \ >- "ANNLIB = libANN.a" \ >- "C++ = g++" \ >- "CFLAGS = -O3" \ >- "MAKELIB = ar ruv" \ >- "RANLIB = true" >- >-# SunOS5 with g++ and shared libraries >-sunos5-g++-sl: >- $(MAKE) targets \ >- "ANNLIB = libANN.so" \ >- "C++ = g++" \ >- "CFLAGS = -fpic -O3" \ >- "MAKELIB = ld -G -o" \ >- "RANLIB = true" >- >-#----------------------------------------------------------------------- >-# Used for the author's testing and debugging only >-#----------------------------------------------------------------------- >- >-# debugging version for authors >-authors-debug: >- $(MAKE) targets \ >- "ANNLIB = libANN.a" \ >- "C++ = g++" \ >- "CFLAGS = -g -DANN_PERF -Wall" \ >- "MAKELIB = ar ruv" \ >- "RANLIB = true" >- >-# performance testing version for authors >-authors-perf: >- $(MAKE) targets \ >- "ANNLIB = libANN.a" \ >- "C++ = g++" \ >- "CFLAGS = -O3 -DANN_PERF -Wall" \ >- "MAKELIB = ar ruv" \ >- "RANLIB = true" >- >-#----------------------------------------------------------------------- >-# Some older ones that I have not tested with the latest version. >-#----------------------------------------------------------------------- >- >-sgi: >- $(MAKE) targets \ >- "ANNLIB = libANN.a" \ >- "C++ = CC -ansi" \ >- "CFLAGS = -O2" \ >- "MAKELIB = ar ruv" \ >- "RANLIB = true" >- >-# DEC Alpha with g++ >-alpha-g++: >- $(MAKE) targets \ >- "ANNLIB = libANN.a" \ >- "C++ = g++" \ >- "CFLAGS = -O3" \ >- "MAKELIB = ar ruv" \ >- "RANLIB = ranlib" >- >-# SunOS4 >-sunos4: >- $(MAKE) targets \ >- "ANNLIB = libANN.a" \ >- "C++ = CC" \ >- "CFLAGS = -O" \ >- "MAKELIB = ar ruv" \ >- "RANLIB = ranlib" >- >-# SunOS4 with g++ >-sunos4-g++: >- $(MAKE) targets \ >- "ANNLIB = libANN.a" \ >- "C++ = g++" \ >- "CFLAGS = -O3" \ >- "MAKELIB = ar ruv" \ >- "RANLIB = ranlib" >- >-# SunOS4 with g++ and shared libraries >-sunos4-g++-sl: >- $(MAKE) targets \ >- "ANNLIB = libANN.so" \ >- "C++ = g++" \ >- "CC = g++" \ >- "CFLAGS = -fPIC -O3" \ >- "MAKELIB = ld -assert pure-text -o" \ >- "RANLIB = true" >- >diff -rupN original/Makefile autotools/Makefile >--- original/Makefile 2010-01-28 05:40:01.000000000 +0100 >+++ autotools/Makefile 1970-01-01 01:00:00.000000000 +0100 >@@ -1,115 +0,0 @@ >-#----------------------------------------------------------------------------- >-# Top-level Makefile for ANN. >-# >-# ANN: Approximate Nearest Neighbors >-# Version: 1.1 05/03/05 >-#----------------------------------------------------------------------------- >-# Copyright (c) 1997-2005 University of Maryland and Sunil Arya and >-# David Mount. All Rights Reserved. >-# >-# This software and related documentation is part of the Approximate >-# Nearest Neighbor Library (ANN). This software is provided under >-# the provisions of the Lesser GNU Public License (LGPL). See the >-# file ../ReadMe.txt for further information. >-# >-# The University of Maryland (U.M.) and the authors make no >-# representations about the suitability or fitness of this software for >-# any purpose. It is provided "as is" without express or implied >-# warranty. >-#----------------------------------------------------------------------------- >-# Revision 0.1 09/06/97 >-# alpha release >-# Revision 0.2 06/26/98 >-# Minor changes to fix compilation errors on SGI systems. >-# Revision 1.0 04/01/05 >-# Initial release (finally!) >-# Added linux-g++ target >-# Revision 1.1 05/03/05 >-# Added macosx-g++ target >-#----------------------------------------------------------------------------- >- >-#----------------------------------------------------------------------------- >-# default: list the options >-# The following legacy targets are also available. >-# make sunos4 for Sun with SunOS 4.x >-# make sunos4-g++ for Sun with SunOS 4.x and g++ >-# make alpha-g++ for DEC Alpha and g++ >-# The following targets are used for internal development only >-# make authors-debug author's debugging >-# make authors-perf author's performance evaluations >-# make distribution author's generation of distribution file >-#----------------------------------------------------------------------------- >-default: >- @echo "Enter one of the following:" >- @echo " make linux-g++ for Linux and g++" >- @echo " make macosx-g++ for Mac OS X and g++" >- @echo " make sunos5 for Sun with SunOS 5.x" >- @echo " make sunos5-sl for Sun with SunOS 5.x, make shared libs" >- @echo " make sunos5-g++ for Sun with SunOS 5.x and g++" >- @echo " make sunos5-g++-sl for Sun with SunOS 5.x, g++, make shared libs" >- @echo " make clean remove .o files" >- @echo " make realclean remove .o, library and executable files" >- @echo " " >- @echo "See file Makefile for other compilation options, such as disabling" >- @echo "performance measurement code." >- >-#----------------------------------------------------------------------------- >-# main make entry point >-#----------------------------------------------------------------------------- >-alpha-g++ macosx-g++ linux-g++ sgi sunos4 sunos4-g++ sunos5 sunos5-g++ sunos5-g++-sl authors-debug authors-perf: >- cd src ; $(MAKE) $@ >- cd test ; $(MAKE) $@ >- cd sample ; $(MAKE) $@ >- cd ann2fig ; $(MAKE) $@ >- >-#----------------------------------------------------------------------------- >-# Remove .o files and core files >-#----------------------------------------------------------------------------- >-clean: >- cd src ; $(MAKE) clean >- cd test ; $(MAKE) clean >- cd sample ; $(MAKE) clean >- cd ann2fig ; $(MAKE) clean >- cd doc ; $(MAKE) clean >- cd MS_Win32; $(MAKE) clean >- cd validate ; $(MAKE) clean >- >-#----------------------------------------------------------------------------- >-# Remove everthing that can be remade >-#----------------------------------------------------------------------------- >-realclean: >- -rm -f lib/* >- -rm -f bin/* >- cd src ; $(MAKE) realclean >- cd test ; $(MAKE) realclean >- cd sample ; $(MAKE) realclean >- cd ann2fig ; $(MAKE) realclean >- cd doc ; $(MAKE) realclean >- cd MS_Win32; $(MAKE) realclean >- cd validate ; $(MAKE) realclean >- >-#----------------------------------------------------------------------------- >-# Make distribution package (for use by authors only) >-#----------------------------------------------------------------------------- >-DISTR = ann_1.1.2 >- >-distribution: realclean >- cd .. ; mv -f $(DISTR) $(DISTR)-old; mkdir $(DISTR) >- cp Copyright.txt ../$(DISTR) >- cp License.txt ../$(DISTR) >- cp Make-config ../$(DISTR) >- cp Makefile ../$(DISTR) >- cp ReadMe.txt ../$(DISTR) >- cp -r MS_Win32 ../$(DISTR) >-# cd ..; mv -f $(DISTR)_MS_Win32_bin $(DISTR)_MS_Win32_bin-old >- cp -r MS_Win32_bin ../$(DISTR)_MS_Win32_bin >- cp -r bin ../$(DISTR) >- cp -r include ../$(DISTR) >- cp -r lib ../$(DISTR) >- cp -r src ../$(DISTR) >- cp -r test ../$(DISTR) >- cp -r sample ../$(DISTR) >- cp -r ann2fig ../$(DISTR) >- cd ../$(DISTR); mkdir doc >- cp doc/*.pdf ../$(DISTR)/doc >-# cd .. ; tar -cfv $(DISTR).tar $(DISTR) ; gzip $(DISTR).tar >diff -rupN original/Makefile.am autotools/Makefile.am >--- original/Makefile.am 1970-01-01 01:00:00.000000000 +0100 >+++ autotools/Makefile.am 2015-02-03 14:15:10.782873203 +0100 >@@ -0,0 +1,7 @@ >+ACLOCAL_AMFLAGS = -I m4 >+ >+pkgconfigdir = $(libdir)/pkgconfig >+nodist_pkgconfig_DATA = ANN.pc >+ >+SUBDIRS = include/ src/ >+CLEANFILES = *~ >diff -rupN original/src/Makefile autotools/src/Makefile >--- original/src/Makefile 2010-01-28 05:40:01.000000000 +0100 >+++ autotools/src/Makefile 1970-01-01 01:00:00.000000000 +0100 >@@ -1,121 +0,0 @@ >-#----------------------------------------------------------------------------- >-# Makefile for ANN library >-#---------------------------------------------------------------------- >-# Copyright (c) 1997-2005 University of Maryland and Sunil Arya and >-# David Mount. All Rights Reserved. >-# >-# This software and related documentation is part of the Approximate >-# Nearest Neighbor Library (ANN). This software is provided under >-# the provisions of the Lesser GNU Public License (LGPL). See the >-# file ../ReadMe.txt for further information. >-# >-# The University of Maryland (U.M.) and the authors make no >-# representations about the suitability or fitness of this software for >-# any purpose. It is provided "as is" without express or implied >-# warranty. >-#---------------------------------------------------------------------- >-# History: >-# Revision 0.1 03/04/98 >-# Initial release >-# Revision 1.0 04/01/05 >-# Renamed files from .cc to .cpp for Microsoft Visual C++ >-# Added kd_dump.cpp >-# Revision 1.1 05/03/05 >-# Added kd_fix_rad_search.cpp and bd_fix_rad_search.cpp >-#---------------------------------------------------------------------- >- >-#----------------------------------------------------------------------------- >-# Some basic definitions: >-# BASEDIR where include, src, lib, ... are >-# INCLIB include directory >-# LIBLIB library directory >-#----------------------------------------------------------------------------- >-BASEDIR = .. >-INCDIR = $(BASEDIR)/include >-LIBDIR = $(BASEDIR)/lib >- >-SOURCES = ANN.cpp brute.cpp kd_tree.cpp kd_util.cpp kd_split.cpp \ >- kd_dump.cpp kd_search.cpp kd_pr_search.cpp kd_fix_rad_search.cpp \ >- bd_tree.cpp bd_search.cpp bd_pr_search.cpp bd_fix_rad_search.cpp \ >- perf.cpp >- >-HEADERS = kd_tree.h kd_split.h kd_util.h kd_search.h \ >- kd_pr_search.h kd_fix_rad_search.h perf.h pr_queue.h pr_queue_k.h >- >-OBJECTS = $(SOURCES:.cpp=.o) >- >-#----------------------------------------------------------------------------- >-# Make the library >-#----------------------------------------------------------------------------- >- >-default: >- @echo "Specify a target configuration" >- >-targets: $(LIBDIR)/$(ANNLIB) >- >-$(LIBDIR)/$(ANNLIB): $(OBJECTS) >- $(MAKELIB) $(ANNLIB) $(OBJECTS) >- $(RANLIB) $(ANNLIB) >- mv $(ANNLIB) $(LIBDIR) >- >-#----------------------------------------------------------------------------- >-# Make object files >-#----------------------------------------------------------------------------- >- >-ANN.o: ANN.cpp >- $(C++) -c -I$(INCDIR) $(CFLAGS) ANN.cpp >- >-brute.o: brute.cpp >- $(C++) -c -I$(INCDIR) $(CFLAGS) brute.cpp >- >-kd_tree.o: kd_tree.cpp >- $(C++) -c -I$(INCDIR) $(CFLAGS) kd_tree.cpp >- >-kd_util.o: kd_util.cpp >- $(C++) -c -I$(INCDIR) $(CFLAGS) kd_util.cpp >- >-kd_split.o: kd_split.cpp >- $(C++) -c -I$(INCDIR) $(CFLAGS) kd_split.cpp >- >-kd_search.o: kd_search.cpp >- $(C++) -c -I$(INCDIR) $(CFLAGS) kd_search.cpp >- >-kd_pr_search.o: kd_pr_search.cpp >- $(C++) -c -I$(INCDIR) $(CFLAGS) kd_pr_search.cpp >- >-kd_fix_rad_search.o: kd_fix_rad_search.cpp >- $(C++) -c -I$(INCDIR) $(CFLAGS) kd_fix_rad_search.cpp >- >-kd_dump.o: kd_dump.cpp >- $(C++) -c -I$(INCDIR) $(CFLAGS) kd_dump.cpp >- >-bd_tree.o: bd_tree.cpp >- $(C++) -c -I$(INCDIR) $(CFLAGS) bd_tree.cpp >- >-bd_search.o: bd_search.cpp >- $(C++) -c -I$(INCDIR) $(CFLAGS) bd_search.cpp >- >-bd_pr_search.o: bd_pr_search.cpp >- $(C++) -c -I$(INCDIR) $(CFLAGS) bd_pr_search.cpp >- >-bd_fix_rad_search.o: bd_fix_rad_search.cpp >- $(C++) -c -I$(INCDIR) $(CFLAGS) bd_fix_rad_search.cpp >- >-perf.o: perf.cpp >- $(C++) -c -I$(INCDIR) $(CFLAGS) perf.cpp >- >-#----------------------------------------------------------------------------- >-# Configuration definitions >-#----------------------------------------------------------------------------- >- >-include ../Make-config >- >-#----------------------------------------------------------------------------- >-# Cleaning >-#----------------------------------------------------------------------------- >- >-clean: >- -rm -f *.o core >- >-realclean: clean >- >diff -rupN original/src/Makefile.am autotools/src/Makefile.am >--- original/src/Makefile.am 1970-01-01 01:00:00.000000000 +0100 >+++ autotools/src/Makefile.am 2015-02-07 04:13:50.274950045 +0100 >@@ -0,0 +1,28 @@ >+AM_CPPFLAGS = -I $(top_srcdir)/include >+ >+lib_LTLIBRARIES = libANN.la >+libANN_la_SOURCES = $(top_srcdir)/include \ >+ bd_tree.h \ >+ kd_fix_rad_search.h \ >+ kd_pr_search.h \ >+ kd_search.h \ >+ kd_split.h \ >+ kd_tree.h \ >+ kd_util.h \ >+ pr_queue.h \ >+ pr_queue_k.h \ >+ ANN.cpp \ >+ bd_fix_rad_search.cpp \ >+ bd_pr_search.cpp \ >+ bd_search.cpp \ >+ bd_tree.cpp \ >+ brute.cpp \ >+ kd_dump.cpp \ >+ kd_fix_rad_search.cpp \ >+ kd_pr_search.cpp \ >+ kd_search.cpp \ >+ kd_split.cpp \ >+ kd_tree.cpp \ >+ kd_util.cpp \ >+ perf.cpp >+CLEANFILES = *~
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=397424">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 541260
:
397422
| 397424
