Remove libdwarf 20191104

recipes/libdwarf/all/conandata.yml

@@ -14,9 +14,6 @@ sources:
   "0.5.0":
     url: "https://www.prevanders.net/libdwarf-0.5.0.tar.xz"
     sha256: "11fa822c60317fa00e1a01a2ac9e8388f6693e8662ab72d352c5f50c7e0112a9"
-  "20191104":
-    url: "https://www.prevanders.net/libdwarf-20191104.tar.gz"
-    sha256: "45f50a966314421b7dab525859853616df6c9680f0ccf2f44b030c505236eaba"
 patches:
   "0.9.1":
     - patch_file: "patches/0.9.1-0001-fixes.patch"
@@ -44,7 +41,3 @@ patches:
     - patch_file: "patches/0.5.0-0001-fix-DW_API.patch"
       patch_description: "fix DW_API definition"
       patch_type: "portability"
-  "20191104":
-    - patch_file: "patches/20191104-0001-patch.patch"
-      patch_description: "use cci package, remove lib64/bin64 install folders"
-      patch_type: "conan"

recipes/libdwarf/all/conanfile.py

@@ -50,10 +50,10 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        if self.options.with_dwarfgen or self.version == "20191104":
+        if self.options.with_dwarfgen:
             self.requires("libelf/0.8.13")
         self.requires("zlib/[>=1.2.11 <2]")
-        if self.version != "20191104" and Version(self.version) >= Version("0.9.0"):
+        if  Version(self.version) >= Version("0.9.0"):
             self.requires("zstd/1.5.5")
 
     def source(self):
@@ -82,20 +82,12 @@ def build(self):
         cmake.build()
 
     def package(self):
-        if self.version == "20191104":
-            copy(self, pattern="COPYING", dst=os.path.join(self.package_folder, "licenses"), src=os.path.join(self.source_folder, "libdwarf"))
-            rename(self, os.path.join(self.package_folder, "licenses", "COPYING"), os.path.join(self.package_folder, "licenses", "COPYING-libdwarf"))
-            if self.options.with_dwarfgen:
-                copy(self, pattern="COPYING", dst=os.path.join(self.package_folder, "licenses"), src=os.path.join(self.source_folder, "dwarfgen"))
-                rename(self, os.path.join(self.package_folder, "licenses", "COPYING"), os.path.join(self.package_folder, "licenses", "COPYING-dwarfgen"))
-            copy(self, pattern="COPYING", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder)
-        else:
-            copy(self, pattern="COPYING", dst=os.path.join(self.package_folder, "licenses"), src=os.path.join(self.source_folder, "src", "lib", "libdwarf"))
-            rename(self, os.path.join(self.package_folder, "licenses", "COPYING"), os.path.join(self.package_folder, "licenses", "COPYING-libdwarf"))
-            if self.options.with_dwarfgen:
-                copy(self, pattern="COPYING", dst=os.path.join(self.package_folder, "licenses"), src=os.path.join(self.source_folder, "src", "bin", "dwarfgen"))
-                rename(self, os.path.join(self.package_folder, "licenses", "COPYING"), os.path.join(self.package_folder, "licenses", "COPYING-dwarfgen"))
-            copy(self, pattern="COPYING", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder)
+        copy(self, pattern="COPYING", dst=os.path.join(self.package_folder, "licenses"), src=os.path.join(self.source_folder, "src", "lib", "libdwarf"))
+        rename(self, os.path.join(self.package_folder, "licenses", "COPYING"), os.path.join(self.package_folder, "licenses", "COPYING-libdwarf"))
+        if self.options.with_dwarfgen:
+            copy(self, pattern="COPYING", dst=os.path.join(self.package_folder, "licenses"), src=os.path.join(self.source_folder, "src", "bin", "dwarfgen"))
+            rename(self, os.path.join(self.package_folder, "licenses", "COPYING"), os.path.join(self.package_folder, "licenses", "COPYING-dwarfgen"))
+        copy(self, pattern="COPYING", dst=os.path.join(self.package_folder, "licenses"), src=self.source_folder)
 
         cmake = CMake(self)
         cmake.install()
@@ -109,6 +101,4 @@ def package_info(self):
             bindir = os.path.join(self.package_folder, "bin")
             self.output.info(f'Appending PATH environment variable: {bindir}')
             self.env_info.PATH.append(bindir)
-
-            if self.version != "20191104":
-                self.cpp_info.libs.append("dwarfp")
+            self.cpp_info.libs.append("dwarfp")

recipes/libdwarf/all/test_package/CMakeLists.txt

@@ -6,6 +6,6 @@ find_package(libdwarf REQUIRED)
 add_executable(${PROJECT_NAME} test_package.c)
 target_link_libraries(${PROJECT_NAME} PRIVATE libdwarf::libdwarf)
 
-if(NOT ${libdwarf_VERSION} MATCHES "^[0-9]*$" AND ${libdwarf_VERSION} VERSION_LESS "0.9.1")
+if(${libdwarf_VERSION} VERSION_LESS "0.9.1")
     target_compile_definitions(${PROJECT_NAME} PRIVATE "LIBDWARF_NESTED_INCLUDE")
 endif()

recipes/libdwarf/config.yml

@@ -9,5 +9,3 @@ versions:
     folder: all
   "0.5.0":
     folder: all
-  "20191104":
-    folder: all