spec: targets: rename attribute mapfile to library/mapfile

Signed-off-by: Enrico Weigelt, metux IT consult <[email protected]>
metux · Dec 10, 2023 · 961c748 · 961c748
1 parent a5a34f9
commit 961c748
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 27 deletions.
diff --git a/doc/spec/targets.md b/doc/spec/targets.md
@@ -91,31 +91,31 @@ pkgconf _(`*.pc`)_, symbolic link _(`*.so`)_ for development, header files, etc.
 
 The attributes are those of `c/executable` plus some more:
 
-| Attribute      | Default        | Description                                               |
-|----------------|----------------|-----------------------------------------------------------|
-| abi            | 1              | shared object version                                     |
-| compiler/lang  | C              | compiler language                                         |
-| description    | ${description} | description _(for pkgconf)_                               |
-| install        | true           | whether to install                                        |
-| install/dir    |                | installation dir                                          |
-| install/subdir |                | installation subdir                                       |
-| library/name   | ${@@^::@id}    | library name _(as used in `-l...` flag)`                  |
-| mapfile        |                | linker map file                                           |
-| pkgconf        |                | map of pkg-config metadata _(`name:` and `description:`)_ |
-| skip/devlink   |                | skip devlink _(to shared object)_                         |
-| skip/pkgconf   |                | skip `.pc` file                                           |
-| skip/shared    |                | skip shared object                                        |
-| skip/static    |                | skip static archive                                       |
-| version        | ${version}     | version _(for pkgconf)_                                   |
+| Attribute       | Default        | Description                                               |
+|-----------------|----------------|-----------------------------------------------------------|
+| abi             | 1              | shared object version                                     |
+| compiler/lang   | C              | compiler language                                         |
+| description     | ${description} | description _(for pkgconf)_                               |
+| install         | true           | whether to install                                        |
+| install/dir     |                | installation dir                                          |
+| install/subdir  |                | installation subdir                                       |
+| library/name    | ${@@^::@id}    | library name _(as used in `-l...` flag)`                  |
+| library/mapfile |                | linker map file                                           |
+| pkgconf         |                | map of pkg-config metadata _(`name:` and `description:`)_ |
+| skip/devlink    |                | skip devlink _(to shared object)_                         |
+| skip/pkgconf    |                | skip `.pc` file                                           |
+| skip/shared     |                | skip shared object                                        |
+| skip/static     |                | skip static archive                                       |
+| version         | ${version}     | version _(for pkgconf)_                                   |
 
 #### Example:
 ```
     zlib:
-        type:           c/library
-        mapfile:        zlib.map
-        version:        1
-        library/name:   z
-        c/defines:      ${buildconf::host::flags::c/defines}
+        type:             c/library
+        version:          1
+        library/mapfile:  zlib.map
+        library/name:     z
+        c/defines:        ${buildconf::host::flags::c/defines}
         pkgconf:
             name:        zlib
             description: ZLib compression library

diff --git a/examples/pkg/zlib.yaml b/examples/pkg/zlib.yaml
@@ -43,10 +43,10 @@ configure:
 
 targets:
     zlib{c/library}:
-        mapfile:        zlib.map
-        version:        1
-        library/name:   z
-        c/defines:      ${buildconf::host::flags::c/defines}
+        version:          1
+        library/name:     z
+        library/mapfile:  zlib.map
+        c/defines:        ${buildconf::host::flags::c/defines}
         pkgconf:
             name:        zlib
             description: ZLib compression library

diff --git a/spec/target/keys.go b/spec/target/keys.go
@@ -30,7 +30,6 @@ const (
 
 	// library main
 	KeyHeaders     = Key("headers")
-	KeyMapfile     = Key("mapfile")
 	KeyLibraryName = Key("library/name")
 	KeyStaticLib   = Key("static::file")
 
@@ -56,7 +55,8 @@ const (
 // libraries
 const (
 	// pkgconf ID for internal libs
-	KeyLibraryPkgId = Key("library/pkgid")
+	KeyLibraryPkgId   = Key("library/pkgid")
+	KeyLibraryMapFile = Key("library/mapfile")
 )
 
 // internal builder configuration