From: Daniel Stenberg Date: Sun, 5 Feb 2023 22:29:49 +0000 (+0100) Subject: packages: remove Android, update README X-Git-Tag: curl-7_88_0~68 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44141512;p=thirdparty%2Fcurl.git packages: remove Android, update README - Nobody builds curl for Android using this anymore - Refreshed the README and converted to markdown Reported-by: John Porter Fixes #10416 Closes #10418 --- diff --git a/.reuse/dep5 b/.reuse/dep5 index 52d1b94d5d..773de32dd9 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -57,10 +57,6 @@ Files: packages/OS400/README.OS400 Copyright: Daniel Stenberg, , et al. License: curl -Files: packages/README -Copyright: Daniel Stenberg, , et al. -License: curl - Files: packages/vms/build_vms.com Copyright: Daniel Stenberg, , et al. License: curl diff --git a/packages/Android/Android.mk b/packages/Android/Android.mk deleted file mode 100644 index 48dd1706e3..0000000000 --- a/packages/Android/Android.mk +++ /dev/null @@ -1,133 +0,0 @@ -#*************************************************************************** -# _ _ ____ _ -# Project ___| | | | _ \| | -# / __| | | | |_) | | -# | (__| |_| | _ <| |___ -# \___|\___/|_| \_\_____| -# -# Copyright (C) Daniel Stenberg, , et al. -# -# This software is licensed as described in the file COPYING, which -# you should have received as part of this distribution. The terms -# are also available at https://curl.se/docs/copyright.html. -# -# You may opt to use, copy, modify, merge, publish, distribute and/or sell -# copies of the Software, and permit persons to whom the Software is -# furnished to do so, under the terms of the COPYING file. -# -# This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY -# KIND, either express or implied. -# -# SPDX-License-Identifier: curl -# -########################################################################### -# Google Android makefile for curl and libcurl -# -# This file can be used when building curl using the full Android source -# release or the NDK. Most users do not want or need to do this; please -# instead read the Android section in docs/INSTALL for alternate -# methods. -# -# Place the curl source (including this makefile) into external/curl/ in the -# Android source tree. Then build them with 'make curl' or just 'make libcurl' -# from the Android root. Tested with Android versions 1.5, 2.1-2.3 -# -# Note: you must first create a curl_config.h file by running configure in the -# Android environment. The only way I've found to do this is tricky. Perform a -# normal Android build with libcurl in the source tree, providing the target -# "showcommands" to make. The build will eventually fail (because curl_config.h -# doesn't exist yet), but the compiler commands used to build curl will be -# shown. Now, from the external/curl/ directory, run curl's normal configure -# command with flags that match what Android itself uses. This will mean -# putting the compiler directory into the PATH, putting the -I, -isystem and -# -D options into CPPFLAGS, putting the -W, -m, -f, -O and -nostdlib options -# into CFLAGS, and putting the -Wl, -L and -l options into LIBS, along with the -# path to the files libgcc.a, crtbegin_dynamic.o, and ccrtend_android.o. -# Remember that the paths must be absolute since you will not be running -# configure from the same directory as the Android make. The normal -# cross-compiler options must also be set. Note that the -c, -o, -MD and -# similar flags must not be set. -# -# To see all the LIBS options, you'll need to do the "showcommands" trick on an -# executable that's already buildable and watch what flags Android uses to link -# it (dhcpcd is a good choice to watch). You'll also want to add -L options to -# LIBS that point to the out/.../obj/lib/ and out/.../obj/system/lib/ -# directories so that additional libraries can be found and used by curl. -# -# The end result will be a configure command that looks something like this -# (the environment variable A is set to the Android root path which makes the -# command shorter): -# -# A=`realpath ../..` && \ -# PATH="$A/prebuilt/linux-x86/toolchain/arm-eabi-X/bin:$PATH" \ -# ./configure --host=arm-linux CC=arm-eabi-gcc \ -# CPPFLAGS="-I $A/system/core/include ..." \ -# CFLAGS="-nostdlib -fno-exceptions -Wno-multichar ..." \ -# LIBS="$A/prebuilt/linux-x86/toolchain/arm-eabi-X/lib/gcc/arm-eabi/X\ -# /interwork/libgcc.a ..." -# -# Finally, copy the file COPYING to NOTICE so that the curl license gets put -# into the right place (but see the note about this below). -# -# Dan Fandrich -# November 2011 - -LOCAL_PATH:= $(call my-dir)/../.. - -common_CFLAGS := -Wpointer-arith -Wwrite-strings -Wunused -Winline -Wnested-externs -Wmissing-declarations -Wmissing-prototypes -Wno-long-long -Wfloat-equal -Wno-multichar -Wsign-compare -Wno-format-nonliteral -Wendif-labels -Wstrict-prototypes -Wdeclaration-after-statement -Wno-system-headers -DHAVE_CONFIG_H - -######################### -# Build the libcurl library - -include $(CLEAR_VARS) -include $(LOCAL_PATH)/lib/Makefile.inc -CURL_HEADERS := \ - curl.h \ - system.h \ - curlver.h \ - easy.h \ - mprintf.h \ - multi.h \ - stdcheaders.h \ - typecheck-gcc.h - -LOCAL_SRC_FILES := $(addprefix lib/,$(CSOURCES)) -LOCAL_C_INCLUDES += $(LOCAL_PATH)/include/ -LOCAL_CFLAGS += $(common_CFLAGS) - -LOCAL_COPY_HEADERS_TO := libcurl/curl -LOCAL_COPY_HEADERS := $(addprefix include/curl/,$(CURL_HEADERS)) - -LOCAL_MODULE:= libcurl -LOCAL_MODULE_TAGS := optional - -# Copy the licence to a place where Android will find it. -# Actually, this doesn't quite work because the build system searches -# for NOTICE files before it gets to this point, so it will only be seen -# on subsequent builds. -ALL_PREBUILT += $(LOCAL_PATH)/NOTICE -$(LOCAL_PATH)/NOTICE: $(LOCAL_PATH)/COPYING | $(ACP) - $(copy-file-to-target) - -include $(BUILD_STATIC_LIBRARY) - - -######################### -# Build the curl binary - -include $(CLEAR_VARS) -include $(LOCAL_PATH)/src/Makefile.inc -LOCAL_SRC_FILES := $(addprefix src/,$(CURL_CFILES)) - -LOCAL_MODULE := curl -LOCAL_MODULE_TAGS := optional -LOCAL_STATIC_LIBRARIES := libcurl -LOCAL_SYSTEM_SHARED_LIBRARIES := libc - -LOCAL_C_INCLUDES += $(LOCAL_PATH)/include $(LOCAL_PATH)/lib - -# This may also need to include $(CURLX_CFILES) in order to correctly link -# if libcurl is changed to be built as a dynamic library -LOCAL_CFLAGS += $(common_CFLAGS) - -include $(BUILD_EXECUTABLE) diff --git a/packages/Makefile.am b/packages/Makefile.am index 33432b06ef..c3a2114d91 100644 --- a/packages/Makefile.am +++ b/packages/Makefile.am @@ -23,7 +23,7 @@ ########################################################################### SUBDIRS = vms -EXTRA_DIST = README \ +EXTRA_DIST = README.md \ OS400/README.OS400 \ OS400/ccsidcurl.c \ OS400/ccsidcurl.h \ diff --git a/packages/README b/packages/README deleted file mode 100644 index 2487d95d03..0000000000 --- a/packages/README +++ /dev/null @@ -1,27 +0,0 @@ - _ _ ____ _ - ___| | | | _ \| | - / __| | | | |_) | | - | (__| |_| | _ <| |___ - \___|\___/|_| \_\_____| - -PACKAGES - - This directory and all its subdirectories are for special package -information, template, scripts and docs. The files herein should be of use for -those of you who want to package curl in a binary or source format using one -of those custom formats. - - The hierarchy for these directories is something like this: - - packages/[OS]/[FORMAT]/ - - Currently, we have Win32 and Linux for [OS]. There might be different formats -for the same OS so for Linux we have RPM as format. - - We might need to add some differentiation for CPU as well, as there is -Linux-RPMs for several CPUs. However, it might not be necessary since the -packaging should be pretty much the same no matter what CPU that is used. - - For each unique OS-FORMAT pair, there's a directory to "fill"! I'd like to -see a single README with as much details as possible, and then I'd like some -template files for the package process. diff --git a/packages/README.md b/packages/README.md new file mode 100644 index 0000000000..f52f8e477f --- /dev/null +++ b/packages/README.md @@ -0,0 +1,12 @@ + + +# Packages + + This directory and all its subdirectories are for special package +information, templates, scripts and docs. The files herein should be of use +for those of you who want to package curl in a binary or source format for +these platforms.