Ticket #8730: HAIKU_HOST_FEATURE.patch

configure

@@ -584 +584 @@
 HAIKU_GCC_LIBGCC_OBJECTS    ?= ${HAIKU_GCC_LIBGCC_OBJECTS} ;
 EOF
 
-# Generate a boot strap Jamfile in the output directory.
+# Generate a bootstrap Jamfile in the output directory.
 
 cat << EOF > $outputDir/Jamfile
 # automatically generated Jamfile
@@ -595 +595 @@
 include [ FDirName \$(HAIKU_TOP) Jamfile ] ;
 
 EOF
+
+
+
+# hostFeaturesFile=$outputDir/build/HostFeatures
+# rm -f "$hostFeaturesFile"
+# touch "$hostFeaturesFile"
+# jam -a configure_build
+#
+# hostBuildConfigHeader=$outputDir/build/HaikuHostBuildConfig.h
+# rm -f "$hostBuildConfigHeader"
+# echo >> "$buildConfigFile"
+# for feature in `cat $hostFeaturesFile`; do
+#   echo "#define _HAIKU_HOST_FEATURE_$feature 1" >> "$hostBuildConfigHeader"
+#   echo "HAIKU_HOST_FEATURE_$feature = 1 ;" >> "$buildConfigFile"
+# done
+
+
+
+hostBuildConfigHeader=$outputDir/build/HaikuHostBuildConfig.h
+cat << EOF > "$hostBuildConfigHeader"
+/* auto-generated by configure */
+#ifndef _HAIKU_BUILD_HOST_BUILD_CONFIG_H
+#define _HAIKU_BUILD_HOST_BUILD_CONFIG_H
+EOF
+
+jam -a configure_build
+
+cat << EOF >> "$hostBuildConfigHeader"
+#endif  /* _HAIKU_BUILD_HOST_BUILD_CONFIG_H */
+EOF
+
+
+echo >> "$buildConfigFile"
+cat "$hostBuildConfigHeader" | grep "#define _HAIKU_BUILD_FEATURE_" \
+    | sed -e 's@#define _\(HAIKU_BUILD_FEATURE_[^[:space:]]*\)[[:space:]]*\(.*\)@\1 = \2 ;@' \
+    >> "$buildConfigFile"

headers/build/HaikuBuild.h

@@ -6 +6 @@
 #define _HAIKU_BUILD_H
 
 
-//#include <HaikuHostBuildConfig.h>
+#include <HaikuHostBuildConfig.h>
 
 
 #define _HAIKU_BUILD_STRING(string)
@@ -27 +27 @@
 // NOTE: #8730 -- _HAIKU_BUILD_DECLARE_CONSTANT is untested.
 #ifdef _HAIKU_BUILD_LIBROOT_FUNCTION_WRAPPER
 #   define _HAIKU_BUILD_DECLARE_CONSTANT(type, name) \
-        extern type _haiku_build##name; \
+        extern type _haiku_build##name;
 #else
 #   define _HAIKU_BUILD_DECLARE_CONSTANT(type, name) \
         extern type _haiku_build##name; \

src/build/Jamfile

@@ -1 +1 @@
 SubDir HAIKU_TOP src build ;
 
+SubInclude HAIKU_TOP src build configure ;
 SubInclude HAIKU_TOP src build libbe ;
 SubInclude HAIKU_TOP src build libhaikucompat ;
 SubInclude HAIKU_TOP src build libpackage ;

new file src/build/configure/Jamfile

@@ +1 @@
+SubDir HAIKU_TOP src build configure ;
+
+HAIKU_BUILD_HOST_FEATURES = <build!configure>HostFeatures ;
+MakeLocate $(HAIKU_BUILD_HOST_FEATURES) : $(HAIKU_BUILD_OUTPUT_DIR) ;
+
+HAIKU_BUILD_CONFIG_HEADER = <build!configure>HaikuHostBuildConfig.h ;
+MakeLocate $(HAIKU_BUILD_CONFIG_HEADER) : $(HAIKU_BUILD_OUTPUT_DIR) ;
+
+local configureTargets ;
+
+rule ConfigureCheckExists feature : fileTarget
+{
+    local target = $(fileTarget:G=build!configure!test) ;
+
+    FEATURE on $(target) = $(feature) ;
+    NotFile $(target) ;
+    Depends $(target) : $(HAIKU_BUILD_CONFIG_HEADER) $(fileTarget) ;
+
+    ConfigureCheckExists1 $(target)
+        : $(HAIKU_BUILD_CONFIG_HEADER) $(fileTarget) ;
+
+    configureTargets += $(target) ;
+}
+
+
+actions ConfigureCheckExists1
+{
+    if [ -f "$(2[2-])" ]; then
+        echo "#define _HAIKU_BUILD_FEATURE_$(FEATURE) 1" >> $(2[1])
+#       echo $(FEATURE) >> $(2[1])
+    fi
+}
+
+
+rule ConfigureTestCompile feature : sources : libraries
+{
+    local executable = <build!configure>test_$(feature) ;
+
+    BuildPlatformMain $(executable) : $(sources) : $(libraries) ;
+    ConfigureCheckExists $(feature) : $(executable) ;
+}
+
+
+rule ConfigureRunProgram name : sources : libraries
+{
+    local program = $(name:G=build!configure) ;
+    local target = $(name:G=build!configure!test) ;
+
+    BuildPlatformMain $(program) : $(sources) : $(libraries) ;
+
+    ConfigureRunProgram1 ;
+
+    NotFile $(target) ;
+    Depends $(target) : $(HAIKU_BUILD_CONFIG_HEADER) $(program) ;
+
+    ConfigureRunProgram1 $(target) : $(HAIKU_BUILD_CONFIG_HEADER) $(program) ;
+
+    configureTargets += $(target) ;
+}
+
+
+actions ConfigureRunProgram1
+{
+    $(2[2-]) >> $(2[1])
+}
+
+
+ConfigureRunProgram test_int_types : test_int_types.cpp ;
+
+
+Depends configure_build : $(configureTargets) ;
+NotFile configure_build ;

new file src/build/configure/test_int_types.cpp

@@ +1 @@
+/*
+ * Copyright 2011, Ingo Weinhold, ingo_weinhold@gmx.de.
+ * Distributed under the terms of the MIT License.
+ */
+
+
+#include <inttypes.h>
+#include <stdio.h>
+
+
+template<typename Type>
+struct TypeInfo {
+    static const char* const TypeName();
+    static const char* const Prefix();
+};
+
+
+#define DEFINE_TYPE_INFO_TEMPLATE(type, prefix) \
+    template<>                                  \
+    struct TypeInfo<type> {                     \
+        static const char* const TypeName()     \
+        {                                       \
+            return #type;                       \
+        }                                       \
+        static const char* const Prefix()       \
+        {                                       \
+            return prefix;                      \
+        }                                       \
+    };
+
+#define DEFINE_TYPE_INFO_TEMPLATE_SIGNED_AND_UNSIGNED(type, prefix) \
+    DEFINE_TYPE_INFO_TEMPLATE(type, prefix)                         \
+    DEFINE_TYPE_INFO_TEMPLATE(unsigned type, prefix)
+
+
+DEFINE_TYPE_INFO_TEMPLATE_SIGNED_AND_UNSIGNED(char, "")
+DEFINE_TYPE_INFO_TEMPLATE(signed char, "")
+DEFINE_TYPE_INFO_TEMPLATE_SIGNED_AND_UNSIGNED(short, "")
+DEFINE_TYPE_INFO_TEMPLATE_SIGNED_AND_UNSIGNED(int, "")
+DEFINE_TYPE_INFO_TEMPLATE_SIGNED_AND_UNSIGNED(long, "l")
+DEFINE_TYPE_INFO_TEMPLATE_SIGNED_AND_UNSIGNED(long long, "ll")
+
+
+template<typename Type>
+struct PrintTypeInfo {
+    static void Print(const char* name)
+    {
+        printf("#define _HAIKU_BUILD_FEATURE_%s %s\n", name,
+            TypeInfo<Type>::TypeName());
+        printf("#define _HAIKU_BUILD_FEATURE_FORMAT_PREFIX_%s \"%s\"\n", name,
+            TypeInfo<Type>::Prefix());
+    }
+};
+
+
+#define PRINT_TYPE_INFO(type)   PrintTypeInfo<type##_t>::Print(#type)
+
+#define PRINT_TYPE_INFO_SIGNED_AND_UNSIGNED(type)   \
+    PRINT_TYPE_INFO(type);                          \
+    PRINT_TYPE_INFO(u##type)
+
+
+int
+main()
+{
+    PRINT_TYPE_INFO_SIGNED_AND_UNSIGNED(int8);
+    PRINT_TYPE_INFO_SIGNED_AND_UNSIGNED(int16);
+    PRINT_TYPE_INFO_SIGNED_AND_UNSIGNED(int32);
+    PRINT_TYPE_INFO_SIGNED_AND_UNSIGNED(int64);
+    return 0;
+}